diff --git a/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in b/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in
index 351e6a5..3a5f118 100644
--- a/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in
+++ b/src/ports/postgres/modules/deep_learning/input_data_preprocessor.py_in
@@ -528,9 +528,10 @@
 
         # Disable optimizer (ORCA) for platforms that use it
         # since we want to use a groupagg instead of hashagg
-        with OptimizerControl(False) and HashaggControl(False):
-            # Run actual batching query
-            plpy.execute(batching_query.format(**locals()))
+        with OptimizerControl(False):
+            with HashaggControl(False):
+                # Run actual batching query
+                plpy.execute(batching_query.format(**locals()))
 
         plpy.execute("DROP TABLE {0}".format(normalized_tbl))