diff -Naur orocos-ocl-1.8.0-orig/bin/cdeployer.cpp orocos-ocl-1.8.0/bin/cdeployer.cpp
--- orocos-ocl-1.8.0-orig/bin/cdeployer.cpp	2009-04-30 13:21:16.000000000 -0400
+++ orocos-ocl-1.8.0/bin/cdeployer.cpp	2009-04-30 13:17:13.000000000 -0400
@@ -48,10 +48,13 @@
     // were we given TAO options? ie find "--"
     int     taoIndex    = 0;
     bool    found       = false;
-    for (taoIndex=0; !found && taoIndex<argc; ++taoIndex)
+
+    while(!found && taoIndex<argc)
     {
         found = (0 == strcmp("--", argv[taoIndex]));
+        if(!found) taoIndex++;
     }
+
     if (found) {
         argv[taoIndex] = argv[0];
     }
@@ -70,8 +73,9 @@
     // if TAO options not found then have TAO process just the program name,
     // otherwise TAO processes the program name plus all options (potentially
     // none) after "--"
-    ControlTaskServer::InitOrb( argc - taoIndex, &argv[taoIndex] );

+    ControlTaskServer::InitOrb( argc - taoIndex, &argv[taoIndex] );
+
     ControlTaskServer::Create( &dc );

     // Only start the script after the Orb was created.
diff -Naur orocos-ocl-1.8.0-orig/bin/deployer-corba.cpp orocos-ocl-1.8.0/bin/deployer-corba.cpp
--- orocos-ocl-1.8.0-orig/bin/deployer-corba.cpp	2009-04-30 13:30:27.000000000 -0400
+++ orocos-ocl-1.8.0/bin/deployer-corba.cpp	2009-04-30 13:19:17.000000000 -0400
@@ -52,10 +52,13 @@
     // were we given TAO options? ie find "--"
     int     taoIndex    = 0;
     bool    found       = false;
-    for (taoIndex=0; !found && taoIndex<argc; ++taoIndex)
+
+    while(!found && taoIndex<argc)
     {
         found = (0 == strcmp("--", argv[taoIndex]));
+        if(!found) taoIndex++;
     }
+
     if (found) {
         argv[taoIndex] = argv[0];
     }