diff --git a/video_prediction_tools/env_setup/create_env.sh b/video_prediction_tools/env_setup/create_env.sh
index 82be2158275b527893c10e2347c6e858b49808f6..750abfb9a8a95db6c6f115e9ad3c14c81320b109 100755
--- a/video_prediction_tools/env_setup/create_env.sh
+++ b/video_prediction_tools/env_setup/create_env.sh
@@ -137,6 +137,7 @@ if [[ "$ENV_EXIST" == 0 ]]; then
     # unset PYTHONPATH on every other machine that is not a known HPC-system	
     unset PYTHONPATH
   fi
+fi
 
 ## set up virtual environment
 if [[ "$ENV_EXIST" == 0 ]]; then
@@ -209,6 +210,7 @@ fi
 
 echo "Set up runscript template for user ${USER}..."
 if [[ -z "${base_dir}" ]]; then
+  shift
   source "${WORKING_DIR}"/utils/runscript_generator/setup_runscript_templates.sh
 else
   source "${WORKING_DIR}"/utils/runscript_generator/setup_runscript_templates.sh ${base_dir}