diff --git a/cloudooo/manager.py b/cloudooo/manager.py
index 2eebe4da46b9f7f5dbdd002daa90fa8cd81b9ec0..5677c66518ad44c2311904e1d63f3bd5abb9f682 100644
--- a/cloudooo/manager.py
+++ b/cloudooo/manager.py
@@ -32,14 +32,16 @@ from mimetypes import guess_all_extensions, guess_extension
 from base64 import encodestring, decodestring
 from zope.interface import implements
 from interfaces.manager import IManager, IERP5Compatibility
-from handler.ooo.granulator import OOGranulator
-from handler.ooo.mimemapper import mimemapper
 from utils.utils import logger
 from cloudooo.interfaces.granulate import ITableGranulator
 from cloudooo.interfaces.granulate import IImageGranulator
 from cloudooo.interfaces.granulate import ITextGranulator
 from fnmatch import fnmatch
 
+#XXX Must be removed
+from cloudooo.handler.ooo.granulator import OOGranulator
+from cloudooo.handler.ooo.mimemapper import mimemapper
+
 class HandlerNotFound(Exception):
   pass