diff --git a/raclette-call b/raclette-call
index 929bd48..274208c 100755
--- a/raclette-call
+++ b/raclette-call
@@ -35,7 +35,7 @@ EOF
 ## SCRIPT START
 ###
 
-while true; do
+while [[ $# -gt 0 ]]; do
     case "$(echo $1 | cut -d. -f1 | cut -d= -f1)" in
       -h|--help)
         usage
diff --git a/raclette-run b/raclette-run
index c292a9c..4e8aed8 100644
--- a/raclette-run
+++ b/raclette-run
@@ -31,16 +31,18 @@ EOF
 ## SCRIPT START
 ###
 
-while true; do
+while [[ $# -gt 0 ]]; do
   case "$(echo $1 | cut -d. -f1)" in
     -h|--help)
       usage
       exit 0
       ;;
     fileserver)
-      command="${1/./_/}" # replace dot . with underscore _
+      command="${1/./_}" # replace dot . with underscore _
+      break
       ;;
   esac
+  shift
 done
 
 source ${ROOTPATH}/functions/run/$(echo "$command" | cut -d_ -f1)