diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py
index c6c3ff1e..9f97a9fa 100644
--- a/module_build_service/scheduler/handlers/repos.py
+++ b/module_build_service/scheduler/handlers/repos.py
@@ -107,7 +107,8 @@ def done(config, session, msg):
     ]
 
     if leftover_components:
-        module_build_service.utils.start_next_build_batch(
+        module_build.batch += 1
+        module_build_service.utils.start_build_batch(
             config, module_build, session, builder)
     else:
         module_build.transition(config, state=models.BUILD_STATES['done'])
diff --git a/module_build_service/utils.py b/module_build_service/utils.py
index 40beebbc..12790563 100644
--- a/module_build_service/utils.py
+++ b/module_build_service/utils.py
@@ -30,6 +30,7 @@ import shutil
 import tempfile
 import os
 import modulemd
+import time
 from module_build_service import log, models
 from module_build_service.errors import ValidationError, UnprocessableEntity
 from module_build_service import app, conf, db, log
@@ -58,8 +59,8 @@ def retry(timeout=120, interval=30, wait_on=Exception):
     return wrapper
 
 
-def start_next_build_batch(config, module, session, builder, components=None):
-    """ Starts a next round of the build cycle for a module. """
+def start_build_batch(config, module, session, builder, components=None):
+    """ Starts a round of the build cycle for a module. """
 
     import koji  # Placed here to avoid py2/py3 conflicts...