diff --git a/printenv.c b/printenv.c
index 534be83..358e714 100644
--- a/printenv.c
+++ b/printenv.c
@@ -22,16 +22,15 @@ main(int argc, char *argv[])
 		usage();
 	} ARGEND;
 
-	if (argc == 1) {
+	if (argc == 0) {
 		while (*environ)
 			printf("%s\n", *environ++);
-
-		return 0;
+	} else {
+		while (*argv) {
+			if ((var = getenv(*argv)))
+				printf("%s\n", var);
+			argv++;
+		}
 	}
-	while(*++argv) {
-		if ((var = getenv(*argv)))
-			printf("%s\n", var);
-	}
-
 	return 0;
 }