diff --git a/focal_point.install b/focal_point.install
index eb694e2..e85100f 100644
--- a/focal_point.install
+++ b/focal_point.install
@@ -67,6 +67,7 @@ function focal_point_update_8002(&$sandbox) {
   if (!isset($sandbox['num_processed'])) {
     $sandbox['last_fid'] = 0;
     $sandbox['num_processed'] = 0;
+    $sandbox['num_skipped'] = 0;
     $sandbox['total_items'] = \Drupal::database()
       ->select('focal_point', 'fp')
       ->countQuery()
@@ -124,11 +125,14 @@ function focal_point_update_8002(&$sandbox) {
         ])
         ->save();
       $sandbox['num_processed']++;
-      $sandbox['last_fid'] = $file->id();
     }
+    else {
+      $sandbox['num_skipped']++;
+    }
+    $sandbox['last_fid'] = $focal_point->fid;
   }
 
-  $sandbox['#finished'] = $sandbox['total_items'] ? $sandbox['num_processed'] / $sandbox['total_items'] : 1;
+  $sandbox['#finished'] = $sandbox['total_items'] ? ($sandbox['num_processed'] + $sandbox['num_skipped']) / $sandbox['total_items'] : 1;
 
   // Intentionally leaving legacy table. You never know...
 }