diff --git a/detector/docker.sh b/detector/docker.sh
index d53c3fc..b90970e 100755
--- a/detector/docker.sh
+++ b/detector/docker.sh
@@ -95,11 +95,7 @@ fi
 # ========================== COMMAND EXECUTION =========================================
 
 cmd=$1
-if [ "$2" = "test_latest" ]; then
-    cmd_args=${@:3}
-else
-    cmd_args=${@:2}
-fi
+cmd_args=${@:2}
 set -x
 case $cmd in
     b | build)
diff --git a/trainer/docker.sh b/trainer/docker.sh
index c31cb94..9f2546a 100755
--- a/trainer/docker.sh
+++ b/trainer/docker.sh
@@ -93,7 +93,11 @@ fi
 # ========================== COMMAND EXECUTION =========================================
 
 cmd=$1
-cmd_args=${@:2}
+if [ "$2" = "test_latest" ]; then
+    cmd_args=${@:3}
+else
+    cmd_args=${@:2}
+fi
 case $cmd in
     b | build)
         docker build . -t $image $build_args $cmd_args