diff --git a/run-mmpol.sh b/run-mmpol.sh
index 7ffa6d579d3e0e92e3c44441ca307d2d03ca0074..1f1dfeee6fb091adb693ec260a3b8c2679e028cf 100755
--- a/run-mmpol.sh
+++ b/run-mmpol.sh
@@ -7,8 +7,9 @@
 
 filesystem=${FILESYSTEM:-scratch}
 policyfile=$POLICYFILE
-tmpglobal=$DIR
-tmpscratch=$DIR
+tmpglobal=$DIR/slurm-tmp-${SLURM_JOBID}
+tmpscratch=$DIR/slurm-tmp-${SLURM_JOBID}
+mkdir -p $tmpglobal
 
 nodes=`scontrol show hostnames "${SLURM_JOB_NODELIST}" | tr '\n' ',' | sed -e 's/,$//'`
 cores="${SLURM_CPUS_PER_TASK}"
@@ -41,4 +42,8 @@ fi
 
 # tag output file with run metadata
 outfile=`ls -t $tmpglobal | head -1`
-mv -n $tmpglobal/$outfile $tmpglobal/${outfile}_$filetag
+if [[ "$outfile" != "" ]]
+then
+   mv -n $tmpglobal/$outfile $tmpglobal/../${outfile}_$filetag
+fi
+rmdir $tmpglobal