diff --git a/modules/migrate/src/Plugin/migrate/destination/EntityFile.php b/modules/migrate/src/Plugin/migrate/destination/EntityFile.php
index 2dbc9de..c2f22b7 100644
--- a/modules/migrate/src/Plugin/migrate/destination/EntityFile.php
+++ b/modules/migrate/src/Plugin/migrate/destination/EntityFile.php
@@ -60,4 +60,12 @@ class EntityFile extends EntityContentBase {
     return parent::import($row, $old_destination_id_values);
   }
 
+  public function getIds() {
+    $ids = parent::getIds();
+    // @todo This is wrong
+    $ids['uri']['type'] = 'string';
+    return $ids;
+  }
+
+
 }
diff --git a/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php b/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php
index 8b9a900..78bb134 100644
--- a/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php
+++ b/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPicture.php
@@ -44,12 +44,16 @@ class UserPicture extends ProcessPluginBase implements ContainerFactoryPluginInt
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $child_configuration = array('migration' => 'd6_user_picture_file');
+    if (isset($configuration['source_ids'])) {
+      $child_configuration['source_ids']['d6_user_picture_file'] = $configuration['source_ids'];
+    }
     return new static(
       $configuration,
       $plugin_id,
       $plugin_definition,
       $migration,
-      $container->get('plugin.manager.migrate.process')->createInstance('migration', array('migration' => 'd6_user_picture_file'), $migration)
+      $container->get('plugin.manager.migrate.process')->createInstance('migration', $child_configuration, $migration)
     );
   }
 
diff --git a/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php b/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
index 757472d..a49d357 100644
--- a/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
+++ b/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
@@ -68,6 +68,7 @@ class UserPictureFile extends DrupalSqlBase {
    */
   public function getIds() {
     $ids['uid']['type'] = 'integer';
+    $ids['picture']['type'] = 'string';
     return $ids;
   }