@@ -196,7 +196,8 @@ class SecureDownloadsJob

                 }

                 // Remove fragments from file name

-                $sanitizedFilename = preg_replace('/'.$objRoots->secureDownloadsRegExp.'/U','',$objFile->filename).'.'.$objFile->extension;

+                $baseFilename = preg_replace('/'.$objRoots->secureDownloadsRegExp.'/U','',$objFile->filename);

+                $sanitizedFilename = $baseFilename.'.'.$objFile->extension;

                 // Check or create folder structure

                 $strSubFolder = sprintf("%03d",ceil(($objMember->id+1)/100)-1).'/'.$objMember->id;

@@ -216,10 +217,9 @@ class SecureDownloadsJob

                 // Do not overwrite existing files

                 $copyId = 1;

-                $baseFilename = $sanitizedFilename;

                 while(file_exists(TL_ROOT . "/".$strTargetFolder.'/'.$sanitizedFilename))

                 {

-                    $sanitizedFilename = $baseFilename.'_'.$copyId++;

+                    $sanitizedFilename = $baseFilename.'_'.$copyId++.'.'.$objFile->extension;

                 }

                 // Try to copy file