diff --git a/Makefile b/Makefile
index 3d7834e..84d1ce2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION   := git-20161228
+VERSION   := git-20170107
 
 PREFIX    := /usr/local
 MANPREFIX := $(PREFIX)/share/man
diff --git a/exec/key-handler b/exec/key-handler
index 03d7499..439ab2e 100644
--- a/exec/key-handler
+++ b/exec/key-handler
@@ -18,7 +18,7 @@ readonly TMPFILE="/tmp/sxiv.$$"
 
 rotate() {
 	degree="$1"
-	while read file; do
+	tr '\n' \0' | xargs -0 realpath | sort | uniq | while read file; do
 		case "$(file -b -i "$file")" in
 		image/jpeg*) jpegtran -rotate "$degree" -copy all -outfile "$file" "$file" ;;
 		*)           mogrify  -rotate "$degree" "$file" ;;
diff --git a/main.c b/main.c
index 8f61ee7..f1ac14a 100644
--- a/main.c
+++ b/main.c
@@ -525,7 +525,7 @@ void run_key_handler(const char *key, unsigned int mask)
 	for (f = i = 0; f < fcnt; i++) {
 		if ((marked && (files[i].flags & FF_MARK)) || (!marked && i == fileidx)) {
 			stat(files[i].path, &oldst[f]);
-			fprintf(pfs, "%s\n", files[i].path);
+			fprintf(pfs, "%s\n", files[i].name);
 			f++;
 		}
 	}