diff --git a/src/run-policy/run-mmpol.sh b/src/run-policy/run-mmpol.sh
index 16542b8eba892680b453179ab01f748f73cde8a1..4057d6792a6ff61152a235b2e83f7b01aebc0ab5 100755
--- a/src/run-policy/run-mmpol.sh
+++ b/src/run-policy/run-mmpol.sh
@@ -127,11 +127,16 @@ if [[ -z "${dry_run}" ]]; then
     # run policy command
     $cmd
     
+    log_name="${output_log_prefix}_${filetag}"
+    log_dir="${outdir}/${log_name}.d"
+    
+    mkdir ${log_dir}
+
     # tag output file with run metadata
-    outfile=`ls -t $tmpglobal | head -1`
-    if [[ "$outfile" != "" ]]
+    raw_log_file=$(find ${outdir} -name "list-${SLURM_JOBID}*" -type d | head -1)
+    if [[ "$raw_log_file" != "" ]]
     then
-       mv -n $tmpglobal/$outfile $tmpglobal/../${output_log_prefix}_$filetag
+       mv -n ${raw_log_file} ${log_dir}/${log_name}
     fi
     rmdir $tmpglobal
 fi
\ No newline at end of file