diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index db06a64d..7edbaf6e 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -375,9 +375,9 @@ namespace Step.NC
             itemId = itemId - 1;
 
             // Update queue running index
-            if (itemId < QueueRunningIndexes[processId] && newIndex > QueueRunningIndexes[processId])
+            if (itemId < QueueRunningIndexes[processId] && newIndex >= QueueRunningIndexes[processId])
                 QueueRunningIndexes[processId] -= 1;
-            if (newIndex < QueueRunningIndexes[processId] && itemId > QueueRunningIndexes[processId])
+            if (newIndex <= QueueRunningIndexes[processId] && itemId > QueueRunningIndexes[processId])
                 QueueRunningIndexes[processId] += 1;
 
             queue = new List<DTOQueueModel>();