diff --git a/fe_paths.admin.inc b/fe_paths.admin.inc
index 3e8fbe6..ca1c9ce 100644
--- a/fe_paths.admin.inc
+++ b/fe_paths.admin.inc
@@ -152,7 +152,6 @@ function fe_paths_entity_edit_form($form, &$form_state, $config = NULL) {
     ),
   );
 
-
   $form['path_name']['transliteration'] = array(
     '#type' => 'checkbox',
     '#title' => t('Transliterate'),
@@ -269,6 +268,13 @@ function fe_paths_entity_edit_form($form, &$form_state, $config = NULL) {
       '#default_value' => isset($config->data['override_options']) ? $config->data['override_options'] : FE_PATHS_OVERRIDE_NEVER,
       '#parents' => array('data', 'override_options'),
     ),
+    'attachment_fields' => array(
+      '#title' => t('Override File Attachment Field Settings'),
+      '#type' => 'checkbox',
+      '#description' => t('Warning: Overrides field level settings sitewide.'),
+      '#default_value' => isset($config->data['attachment_fields']) ? $config->data['attachment_fields'] : FALSE,
+      '#parents' => array('data', 'attachment_fields'),
+    ),
   );
   $form['submit'] = array(
     '#type' => 'submit',
diff --git a/fe_paths.module b/fe_paths.module
index f666279..85a2689 100644
--- a/fe_paths.module
+++ b/fe_paths.module
@@ -299,22 +299,14 @@ function fe_paths_file_process($fid, $entity, $type, $field_name = NULL) {
         continue;
       }
 
-      // Only need field investigation, if field name was passed to this
-      // function.
-      if (!is_null($field_name)) {
-        // If the field name doesn't exists, skip.
-        if (!isset($data['bundle'][$bundle][$field_name])) {
-          continue;
-        }
-
-        // If the field name isn't checked in config, skip
-        if (!$data['bundle'][$bundle][$field_name]) {
+      // If the config does not allow overriding file attachment URLs, skip.
+      if ($data['attachment_fields'] == FALSE) {
+        // This verifies that we are on a file attachment field, not the file upload page or wysiwyg.
+        if ($type == 'node') {
           continue;
         }
       }
 
-      //$fields = fe_paths_get_available_fields($type, $bundle);
-
       if (fe_paths_move_file($file, $config->path, $config->filename, $type, $data, $entity)) {
         $match = TRUE;
         // Store, which configuration with which entity moves the file.
@@ -738,6 +730,7 @@ function fe_paths_get_allowed_widget_types($entity = NULL) {
     'image_image',
     'file_file',
     'media_generic',
+    'media_widget_multiple',
   );
 
   drupal_alter($allowed, $entity);