diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php
index 018113fba..3bd45b2ca 100644
--- a/src/HTMLBuilder/Manager/FileManager.php
+++ b/src/HTMLBuilder/Manager/FileManager.php
@@ -27,12 +27,7 @@ class FileManager implements ManagerInterface
         $attachment_id = 'attachments_'.$options['id_module'].'-'.$options['id_plugin'];
 
         // Cartella delle anteprime
-        if (!empty($options['id_plugin'])) {
-            $directory = '/plugins/'.\Plugins::get($options['id_plugin'])['directory'];
-        } else {
-            $directory = \Modules::get($options['id_module'])['directory'];
-        }
-        $directory = basename($directory);
+        $directory = \Uploads::getUploadDirectory($options['id_module'], $options['id_plugin']);
 
         $dbo = \Database::getConnection();
 
@@ -83,8 +78,8 @@ class FileManager implements ManagerInterface
                     $result .= '
         <tr>
             <td align="left">
-                <a href="'.ROOTDIR.'/files/'.\Modules::get($options['id_module'])['directory'].'/'.$r['filename'].'" target="_blank">
-                    <i class="fa fa-external-link"></i> '.$r['nome'].'
+                <a href="'.ROOTDIR.'/'.$directory.'/'.$r['filename'].'" target="_blank">
+                    <i class="fa fa-external-link"></i> '.$r['nome'].$directory.'
                 </a>
             </td>
             <td>'.\Translator::timestampToLocale($r['created_at']).'</td>
@@ -102,10 +97,10 @@ class FileManager implements ManagerInterface
 
                         if ($extension == 'pdf') {
                             $result .= '
-                    <iframe src="'.\Prints::getPDFLink('files/'.$directory.'/'.$r['filename']).'" frameborder="0" width="100%" height="550"></iframe>';
+                    <iframe src="'.\Prints::getPDFLink($directory.'/'.$r['filename']).'" frameborder="0" width="100%" height="550"></iframe>';
                         } else {
                             $result .= '
-                    <img src="'.ROOTDIR.'/files/'.$directory.'/'.$r['filename'].'" width="100%"></img>';
+                    <img src="'.ROOTDIR.'/'.$directory.'/'.$r['filename'].'" width="100%"></img>';
                         }
 
                         $result .= '
diff --git a/src/Uploads.php b/src/Uploads.php
index f8816dc90..e50af6224 100644
--- a/src/Uploads.php
+++ b/src/Uploads.php
@@ -128,7 +128,7 @@ class Uploads
             $info = Plugins::get($id_plugin);
 
             if (!empty($info['script'])) {
-                $directory = self::fileInfo($info['script'])['name'];
+                $directory = self::fileInfo($info['script'])['filename'];
             } else {
                 $directory = $info['directory'];
             }