diff --git a/lib/jqueue.py b/lib/jqueue.py
index d73136f624c30a6c4aa0caacf7ad40e5bc08aff9..9fb6f789b7c74d6fe90847bddbbc90ee5f245819 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -542,13 +542,14 @@ class JobQueue(object):
         logging.info("Inspecting job queue")
 
         all_job_ids = self._GetJobIDsUnlocked()
+        jobs_count = len(all_job_ids)
         lastinfo = time.time()
         for idx, job_id in enumerate(all_job_ids):
           # Give an update every 1000 jobs or 10 seconds
-          if idx % 1000 == 0 or time.time() >= (lastinfo + 10.0):
-            jobs_count = len(all_job_ids)
+          if (idx % 1000 == 0 or time.time() >= (lastinfo + 10.0) or
+              idx == (jobs_count - 1)):
             logging.info("Job queue inspection: %d/%d (%0.1f %%)",
-                         idx, jobs_count, 100.0 * (idx + 1) / jobs_count)
+                         idx, jobs_count - 1, 100.0 * (idx + 1) / jobs_count)
             lastinfo = time.time()
 
           job = self._LoadJobUnlocked(job_id)