diff --git a/src/sim/cmodule.cc b/src/sim/cmodule.cc
index 89e3852..35bbe84 100644
--- a/src/sim/cmodule.cc
+++ b/src/sim/cmodule.cc
@@ -511,15 +511,15 @@ cGate *cModule::addGate(const char *gatename, cGate::Type type, bool isVector)
     if (!isVector)
     {
         cGate *newGate;
-        if (type!=cGate::OUTPUT)
+        if (type!=cGate::OUTPUT)  // that is, INPUT or INOUT
         {
-            newGate = createGateObject(type);
+            newGate = createGateObject(cGate::INPUT);
             desc->setInputGate(newGate);
             EVCB.gateCreated(newGate);
         }
-        if (type!=cGate::INPUT)
+        if (type!=cGate::INPUT)  // that is, OUTPUT or INOUT
         {
-            newGate = createGateObject(type);
+            newGate = createGateObject(cGate::OUTPUT);
             desc->setOutputGate(newGate);
             EVCB.gateCreated(newGate);
         }
@@ -642,12 +642,12 @@ void cModule::setGateSize(const char *gatename, int newSize)
         for (int i=oldSize; i<newSize; i++)
         {
             if (type!=cGate::OUTPUT) {
-                cGate *newGate = createGateObject(type);
+                cGate *newGate = createGateObject(cGate::INPUT);
                 desc->setInputGate(newGate, i);
                 EVCB.gateCreated(newGate);
             }
             if (type!=cGate::INPUT) {
-                cGate *newGate = createGateObject(type);
+                cGate *newGate = createGateObject(cGate::OUTPUT);
                 desc->setOutputGate(newGate, i);
                 EVCB.gateCreated(newGate);
             }

diff --git a/src/sim/ccomponenttype.cc b/src/sim/ccomponenttype.cc
index b6aaaed..b178c78 100644
--- a/src/sim/ccomponenttype.cc
+++ b/src/sim/ccomponenttype.cc
@@ -133,7 +133,7 @@ cModule *cModuleType::create(const char *modname, cModule *parentmod, int vector
     try {
         // create the new module object
 #ifdef WITH_PARSIM
-        bool isLocal = ev.isModuleLocal(parentmod, modname, index);
+        bool isLocal = ev.isModuleLocal(parentmod, modname, vectorsize<0 ? -1 : index);
         mod = isLocal ? createModuleObject() : new cPlaceholderModule();
 #else
         mod = createModuleObject();

diff --git a/src/sim/parsim/cparsimpartition.cc b/src/sim/parsim/cparsimpartition.cc
index 794252f..63a5d28 100644
--- a/src/sim/parsim/cparsimpartition.cc
+++ b/src/sim/parsim/cparsimpartition.cc
@@ -109,7 +109,7 @@ void cParsimPartition::connectRemoteGates()
                     // pack gate name
                     buffer->pack(ing->getOwnerModule()->getFullPath().c_str());
                     buffer->pack(ing->getName());
-                    buffer->pack(ing->getIndex());
+                    buffer->pack(ing->isVector() ? ing->getIndex() : -1);
                 }
             }
         }
@@ -153,10 +153,13 @@ void cParsimPartition::connectRemoteGates()
             // find corresponding output gate (if we have it) and set remote
             // gate address to the received one
             cModule *m = sim->getModuleByPath(moduleFullPath);
-            cGate *g = m ? m->gate(gateName,gateIndex) : NULL;
+            cGate *g = !m ? NULL : gateIndex==-1 ? m->gate(gateName) : m->gate(gateName,gateIndex);
             cProxyGate *pg = dynamic_cast<cProxyGate *>(g);
 
-            ev << "    gate: " << moduleFullPath << "." << gateName << "["  << gateIndex << "] - ";
+            ev << "    gate: " << moduleFullPath << "." << gateName;
+            if (gateIndex>=0)
+                ev << "["  << gateIndex << "]";
+             ev << " - ";
             if (!pg)
                 ev << "not here\n";
             else