diff --git a/GPUSimulators/FORCE.py b/GPUSimulators/FORCE.py
index ebf4416..205c4d7 100644
--- a/GPUSimulators/FORCE.py
+++ b/GPUSimulators/FORCE.py
@@ -187,9 +187,11 @@ class FORCE (Simulator.BaseSimulator):
                         )
                     )
                 )
+            
+        hip_check(hip.hipDeviceSynchronize())    
         self.u0, self.u1 = self.u1, self.u0
             
-        hip_check(hip.hipDeviceSynchronize())
+        
         hip_check(hip.hipModuleUnload(module))
             
         hip_check(hip.hipFree(cfl_data))
diff --git a/GPUSimulators/HLL.py b/GPUSimulators/HLL.py
index 55d888b..885fbc3 100644
--- a/GPUSimulators/HLL.py
+++ b/GPUSimulators/HLL.py
@@ -180,9 +180,10 @@ class HLL (Simulator.BaseSimulator):
                     )
                 )
 
+        hip_check(hip.hipDeviceSynchronize())
+        
         self.u0, self.u1 = self.u1, self.u0
 
-        hip_check(hip.hipDeviceSynchronize())
         hip_check(hip.hipModuleUnload(module))
 
         hip_check(hip.hipFree(cfl_data))
diff --git a/GPUSimulators/HLL2.py b/GPUSimulators/HLL2.py
index b248eb2..e9b1313 100644
--- a/GPUSimulators/HLL2.py
+++ b/GPUSimulators/HLL2.py
@@ -177,9 +177,10 @@ class HLL2 (Simulator.BaseSimulator):
                         )
                     )
                 )
+
+        hip_check(hip.hipDeviceSynchronize())    
         self.u0, self.u1 = self.u1, self.u0
     
-        hip_check(hip.hipDeviceSynchronize())
         hip_check(hip.hipModuleUnload(module))
 
         hip_check(hip.hipFree(cfl_data))