diff --git a/printa4 b/printa4
index 7f0ec4c..1c07aca 100755
--- a/printa4
+++ b/printa4
@@ -14,17 +14,17 @@ _user="minnocci"
 
 main() {
 	if $NO_CLI; then
-		for f in $@; do
-			scp $f ${_user}@ssh1.dm.unipi.it:/home/${_user}/printa4-$f
-			ssh -XY ${_user}@ssh1.dm.unipi.it okular /home/${_user}/printa4-$f --print
-			ssh ${_user}@ssh1.dm.unipi.it rm /home/${_user}/printa4-$f
+		for f in "$@"; do
+			scp "$f" ${_user}@ssh1.dm.unipi.it:/home/${_user}/printa4-"'$(basename "$f")'"
+			ssh -XY ${_user}@ssh1.dm.unipi.it okular /home/${_user}/printa4-"'$(basename "$f")'" --print
+			ssh ${_user}@ssh1.dm.unipi.it rm /home/${_user}/printa4-"'$(basename "$f")'"
 		done
 	else
 		options="$1"; shift
-		for f in $@; do
-			scp $f ${_user}@ssh1.dm.unipi.it:/home/${_user}/printa4-$f
-			ssh ${_user}@ssh1.dm.unipi.it lp $options /home/${_user}/printa4-$f
-			ssh ${_user}@ssh1.dm.unipi.it rm /home/${_user}/printa4-$f
+		for f in "$@"; do
+			scp "$f" ${_user}@ssh1.dm.unipi.it:/home/${_user}/printa4-"'$(basename "$f")'"
+			ssh ${_user}@ssh1.dm.unipi.it lp $options /home/${_user}/printa4-"'$(basename "$f")'"
+			ssh ${_user}@ssh1.dm.unipi.it rm /home/${_user}/printa4-"'$(basename "$f")'"
 		done
 	fi
 }
@@ -65,7 +65,7 @@ error() {
 if [ -z "$1" ] ; then
 	error "Non hai specificato nessun file...\n"
 else
-	case $1 in
+	case "$1" in
 	-h|--help)
 		usage ;;
 	-c|--cli)