diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index eb251c7f2c89f2bf70c3d36c8055a736e17201b0..d27e87677b1a2209579679a159586466961a5734 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -348,7 +348,9 @@ class ComponentAccumulator(object):
                 elif isinstance (other,ConfigurableService):
                     self.addService(other)
                 elif isinstance(other,ConfigurableAlgorithm):
-                    self.addAlgorithm(other)
+                    self.addEventAlgorithm(other)
+                    #FIXME: At this point we can't distingush event algos from conditions algos.
+                    #Might become possible with new Gaudi configurables
                 elif isinstance(other,ConfigurableAlgTool):
                     self.addPublicTool(other)
                 else: