--- filefield_paths.module.orig	2009-01-16 16:03:29.000000000 -0200
+++ filefield_paths.module	2009-01-17 16:21:32.000000000 -0200
@@ -214,9 +214,10 @@ function filefield_paths_nodeapi(&$node,
 

             // Process filename

             $file['old']['filename'] = $file['filename'];

+            $temp_file['filename'] = $file['filename'];

             if (($file['new']['filename'] = $settings['filename']['value']) != '') {

               $file['new']['filename'] = filefield_paths_process_string($file['new']['filename'], 'node', $node, $settings['filename']);

-              $file['new']['filename'] = filefield_paths_process_string($file['new']['filename'], 'field', array(0 => $file), $settings['filename']);

+              $file['new']['filename'] = filefield_paths_process_string($file['new']['filename'], 'field', array(0 => $temp_file), $settings['filename']);

             }

             else {

               $file['new']['filename'] = $file['filename'];