diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2ed5dc55f888ec2b65676b084bcd50e69f310c4e..02777b2f8ae89be79c2fe44136e94db8d0088243 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 Feeds 7.x 2.0 XXXXXXXXXXXXXXXXXXX
 ---------------------------------
 
+- Fix entity inspection in file fetcher.
 - #932772 alex_b: FeedsProcessor: Consolidate process() and clear().
   FeedsProcessor now implements the process() and clear() methods for creating
   and deleting entities. The extending processors FeedsNodeProcessor,
diff --git a/mappers/file.inc b/mappers/file.inc
index f5346fd7fc385ac4ca6249eb76fa56fb0f807030..1800e0bc43d951e40bb00f0f970ccb5e9a38e2be 100644
--- a/mappers/file.inc
+++ b/mappers/file.inc
@@ -63,9 +63,9 @@ function file_feeds_set_target($entity, $target, $value) {
 
   // Determine file destination.
   // @todo This needs review and debugging.
+  list($entity_id, $vid, $bundle_name) = entity_extract_ids($entity->feeds_item->entity_type, $entity);
+  $instance_info = field_info_instance($entity->feeds_item->entity_type, $target, $bundle_name);
   $info = field_info_field($target);
-  $bundle_name = $entity->entity_type == 'node' ? $entity->type : $entity->entity_type;
-  $instance_info = field_info_instance($entity->entity_type, $target, $bundle_name);
   $account = !empty($entity->uid) ? user_load($entity->uid) : NULL;
   $destination = file_field_widget_uri($info, $instance_info, $account);