diff --git a/bin/xbps-fetch/main.c b/bin/xbps-fetch/main.c
index 3cf629cb..8c920fac 100644
--- a/bin/xbps-fetch/main.c
+++ b/bin/xbps-fetch/main.c
@@ -115,7 +115,7 @@ main(int argc, char **argv)
 	}
 
 	for (int i = 0; i < argc; i++) {
-		if ((argc == 1) && !filename)
+		if (i > 0 || !filename)
 			filename = fname(argv[i]);
 
 		rv = xbps_fetch_file_dest(&xh, argv[i], filename, verbose ? "v" : "");