diff --git a/progs/demos/stex3d.c b/progs/demos/stex3d.c
index e4554d071f3..83ae3684ae2 100644
--- a/progs/demos/stex3d.c
+++ b/progs/demos/stex3d.c
@@ -342,19 +342,19 @@ parseCmdLine(int argc, char **argv)
    GLint i;
 
    for (i = 1; i < argc; i++) {
-      if (strstr(argv[i], "-w") == 0) {
-	 tex_width = atoi((argv[i]) + 2);
-      }
-      else if (strstr(argv[i], "-h") == 0) {
-	 tex_height = atoi((argv[i]) + 2);
-      }
-      else if (strstr(argv[i], "-d") == 0) {
-	 tex_depth = atoi((argv[i]) + 2);
-      }
-      else if (strcmp(argv[i], "-help") == 0) {
+      if (strcmp(argv[i], "-help") == 0) {
 	 printHelp();
 	 return GL_FALSE;
       }
+      else if (strstr(argv[i], "-w") != NULL) {
+	 tex_width = atoi((argv[i]) + 2);
+      }
+      else if (strstr(argv[i], "-h") != NULL) {
+	 tex_height = atoi((argv[i]) + 2);
+      }
+      else if (strstr(argv[i], "-d") != NULL) {
+	 tex_depth = atoi((argv[i]) + 2);
+      }
       else {
 	 printf("%s (Bad option).\n", argv[i]);
 	 printHelp();