diff --git a/app/scripts/build_and_run b/app/scripts/build_and_run
index 11dee56557..a159199673 100755
--- a/app/scripts/build_and_run
+++ b/app/scripts/build_and_run
@@ -33,6 +33,9 @@ while getopts "rbd" opt; do
 	esac
 done
 
+# Remove options from $@
+shift $((OPTIND-1))
+
 if [ $REBUILD -eq 1 ]; then
 	PARAMS=""
 	if [ $DEBUGGER -eq 1 ]; then