diff --git a/vcom/main.cpp b/vcom/main.cpp
index 8e405c7..b562b1d 100644
--- a/vcom/main.cpp
+++ b/vcom/main.cpp
@@ -149,16 +149,12 @@ int main(int argc, char **argv)
                 cerr << "INFO: Unknown command line opt: " << argv[i] << endl;
             }
             else {
-                break; // Rest are VHDL input files
+                vhdl.append(argv[i]);
+                vhdl.append(" ");
             }
         }
     }
 
-    for (; i < argc; ++i) {
-        vhdl.append(argv[i]);
-        vhdl.append(" ");
-    }
-
 #ifdef DEBUG_EN
     cout << "\n\nVCOM CALL PARSED:" << endl;
     cout << "\twork=" << work << endl;
diff --git a/vsim/main.cpp b/vsim/main.cpp
index bc340d3..4b5eb93 100644
--- a/vsim/main.cpp
+++ b/vsim/main.cpp
@@ -112,6 +112,7 @@ int main(int argc, char **argv) {
         }
         else if (GETOPT("-ghdl")) {
             ghdlargs = argv[i];
+            cerr << "GHDARGS=" << argv[i];
         }
         else if (GETOPT("-gtkwave")) {
             wvargs = argv[i];
@@ -121,16 +122,12 @@ int main(int argc, char **argv) {
                 cerr << "INFO: Unknown command line opt: " << argv[i] << endl;
             }
             else {
-                break;
+                top.append(argv[i]);
+                top.append(" ");
             }
         }
     }
 
-    for (; i < argc; ++i) {
-        top.append(argv[i]);
-        top.append(" ");
-    }
-
 
     // -gui work.toplevel(RTL)
     string temp = "";