diff --git a/product/ERP5/Document/Image.py b/product/ERP5/Document/Image.py
index fce1bf15a8b084e7a2a4b4ebeba9a1e53598a501..d95cc33868f5d91676d8bf5017c5129951e425af 100644
--- a/product/ERP5/Document/Image.py
+++ b/product/ERP5/Document/Image.py
@@ -344,10 +344,11 @@ class Image(File, OFSImage):
       kw = dict(display=display, format=format, quality=quality,
                 resolution=resolution, frame=frame, image_size=image_size)
       try:
-        return self.getConversion(**kw)
+        mime, image = self.getConversion(**kw)
+        return mime, image.data
       except KeyError:
         mime, image = self._makeDisplayPhoto(**kw)
-        self.setConversion(image.data, mime, **kw)
+        self.setConversion(image, mime, **kw)
         return mime, image.data
     return self.getContentType(), self.getData()