diff --git a/home/oscar/work/drupal/file_entity-7.x-2.0-beta4/file_entity.pages.inc b/var/www/cignasaludd7.local/sites/all/modules/contrib/file_entity/file_entity.pages.inc
index 19f4d86..8f7f54b 100644
--- a/home/oscar/work/drupal/file_entity-7.x-2.0-beta4/file_entity.pages.inc
+++ b/var/www/cignasaludd7.local/sites/all/modules/contrib/file_entity/file_entity.pages.inc
@@ -803,21 +803,25 @@ function file_entity_edit_submit($form, &$form_state) {
   if (!empty($form_state['values']['replace_upload'])) {
     $replacement = $form_state['values']['replace_upload'];
     // Move file from temp to permanent home.
-    $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($replacement->uri);
-    $replace_mode = $destination_uri == $file->uri ? FILE_EXISTS_REPLACE : FILE_EXISTS_RENAME;
-    if ($new_file_uri = file_unmanaged_copy($replacement->uri, $destination_uri, $replace_mode)) {
-      // @todo Add watchdog() about replaced file here?
-
-      // Remove temporary file.
-      file_delete($replacement);
-
-      // Update if the uri target has changed.
-      if ($new_file_uri != $file->uri) {
-       // Store the original file uri to delete if save is successful.
-       $orphaned_uri = $file->uri;
-
-        // Update file entity uri.
-        $file->uri = $new_file_uri;
+    if (pathinfo($replacement->uri, PATHINFO_EXTENSION) == pathinfo($file->uri, PATHINFO_EXTENSION)) {
+        file_unmanaged_copy($replacement->uri, $file->uri, FILE_EXISTS_REPLACE);
+    } else {
+      $destination_uri = rtrim($file->uri, drupal_basename($file->uri)) . drupal_basename($replacement->uri);
+      $replace_mode = $destination_uri == $file->uri ? FILE_EXISTS_REPLACE : FILE_EXISTS_RENAME;
+      if ($new_file_uri = file_unmanaged_copy($replacement->uri, $destination_uri, $replace_mode)) {
+        // @todo Add watchdog() about replaced file here?
+
+        // Remove temporary file.
+        file_delete($replacement);
+
+        // Update if the uri target has changed.
+        if ($new_file_uri != $file->uri) {
+         // Store the original file uri to delete if save is successful.
+         $orphaned_uri = $file->uri;
+
+          // Update file entity uri.
+          $file->uri = $new_file_uri;
+        }
       }
     }
   }