diff --git a/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php b/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
index dcb0f07dd2..486ba99d90 100644
--- a/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
+++ b/lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
@@ -33,26 +33,25 @@ abstract class AbstractDelivery
 
     public function deliverContent(Request $request, \record_adapter $record, $subdef, $watermark, $stamp)
     {
-        $file = $record->get_subdef($subdef);
-        $pathOut = $file->get_pathfile();
+        $mediaSubdefinition = $record->get_subdef($subdef);
+        $pathOut = $mediaSubdefinition->get_pathfile();
 
-        if ($watermark === true && $file->get_type() === \media_subdef::TYPE_IMAGE) {
-            $pathOut = \recordutils_image::watermark($this->app, $file);
-        } elseif ($stamp === true && $file->get_type() === \media_subdef::TYPE_IMAGE) {
-            $pathOut = \recordutils_image::stamp($this->app, $file);
+        if ($watermark === true && $mediaSubdefinition->get_type() === \media_subdef::TYPE_IMAGE) {
+            $pathOut = \recordutils_image::watermark($this->app, $mediaSubdefinition);
+        } elseif ($stamp === true && $mediaSubdefinition->get_type() === \media_subdef::TYPE_IMAGE) {
+            $pathOut = \recordutils_image::stamp($this->app, $mediaSubdefinition);
         }
 
         $disposition = $request->query->get('download') ? DeliverDataInterface::DISPOSITION_ATTACHMENT : DeliverDataInterface::DISPOSITION_INLINE;
 
-        /** @var Response $response */
-        $response = $this->deliverFile($pathOut, $file->get_file(), $disposition, $file->get_mime());
+        $response = $this->deliverFile($pathOut, $mediaSubdefinition->get_file(), $disposition, $mediaSubdefinition->get_mime());
 
         if (in_array($subdef, array('document', 'preview'))) {
             $response->setPrivate();
             $this->logView($record, $request);
         } elseif ($subdef !== 'thumbnail') {
             try {
-                if ($file->getDataboxSubdef()->get_class() != \databox_subdef::CLASS_THUMBNAIL) {
+                if ($mediaSubdefinition->getDataboxSubdef()->get_class() != \databox_subdef::CLASS_THUMBNAIL) {
                     $response->setPrivate();
                     $this->logView($record, $request);
                 }