diff --git a/src/cnc/gcode/controller/CNCCommand.java b/src/cnc/gcode/controller/CNCCommand.java
index f5c7863..abe731a 100644
--- a/src/cnc/gcode/controller/CNCCommand.java
+++ b/src/cnc/gcode/controller/CNCCommand.java
@@ -611,7 +611,7 @@ public State calcCommand(Calchelper c)
                 
                 //Take A into account
                 double da;
-                if(apmm==0 || type!=Type.G1){
+                if(apmm==0 || type==Type.G0){
                     da=move.getA()/DatabaseV2.AFEEDRATE.getsaved()*60;
                 }
                 else{