--- filefield_paths.module.o	Sun Mar 20 10:54:42 2011
+++ filefield_paths.module	Mon May 30 04:10:43 2011
@@ -508,7 +508,7 @@ function filefield_paths_filefield_paths
 
         // Fix reference to old paths.
         if (isset($node->body) || module_exists('content')) {
-          $file['filepath']['new'] = str_replace($file['filename']['old'], $file['filename']['new'], $file['filepath']['new']);
+          $file['filepath']['new'] = $file['field']['filepath'];
           $file_directory_path = variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC ? file_directory_path() : 'system/files';
 
           // Regular expression to replace old file reference.