diff --git a/scripts/larvatagger b/scripts/larvatagger
index 91c4d7f2df592049367abc46c40ab0d0de2ebf72..044eef8629ae1017353e4163d68ab1f096944f2a 100755
--- a/scripts/larvatagger
+++ b/scripts/larvatagger
@@ -9,17 +9,18 @@
 currentdir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")
 
 if [ "${1:0:2}" = "-J" ]; then
-cmd=$2
+args="$1 "
+shift
 else
-cmd=$1
+args=
 fi
+cmd=$1
 
 case $cmd in
 open)
   shift
   datapath=$1
   shift
-  args=
   if [ -n "$BACKENDS_PATH" ]; then
     args="--backends=\"$BACKENDS_PATH\" $args"
   fi
@@ -35,14 +36,14 @@ train|predict)
     shift
     backend=$1
     shift
-    "$currentdir/larvatagger-toolkit.jl" $cmd "$BACKENDS_PATH/$backend" $@
+    "$currentdir/larvatagger-toolkit.jl" $cmd "$BACKENDS_PATH/$backend" $args$@
   else
-    "$currentdir/larvatagger-toolkit.jl" $@
+    "$currentdir/larvatagger-toolkit.jl" $args$@
   fi
   ;;
 
 import|merge|--version|-V)
-  "$currentdir/larvatagger-toolkit.jl" $@
+  "$currentdir/larvatagger-toolkit.jl" $args$@
   ;;
 
 *)
diff --git a/scripts/larvatagger.sh b/scripts/larvatagger.sh
index 3222537602cecfdee7015b6f0c38f64c21d026b6..a261c70bdf86db7854c25d1e7399a0d8c61f341c 100755
--- a/scripts/larvatagger.sh
+++ b/scripts/larvatagger.sh
@@ -158,7 +158,9 @@ fi
 RUN_ARGS="$RUN_ARGS --mount type=bind,src=\"$(realpath $instance)\",dst=/app/$backend/models/$(basename $instance)"
 done
 
-eval "exec $docker run $RUN_ARGS -i ${DOCKER_ARGS}\"$LARVATAGGER_IMAGE\" open \"/data/$file\" $TAGGER_ARGS $@"
+DOCKER_RUN="exec $docker run $RUN_ARGS -i ${DOCKER_ARGS}\"$LARVATAGGER_IMAGE\" open \"/data/$file\" $TAGGER_ARGS $@"
+echo $DOCKER_RUN
+eval $DOCKER_RUN
 ;;
 
 	import | merge)