--- trunk/src/brains/SimCreator.cpp	2005/01/12 22:41:40	246
+++ trunk/src/brains/SimCreator.cpp	2005/02/07 19:14:26	297
@@ -116,6 +116,10 @@ SimInfo*  SimCreator::createSim(const std::string & md
         simError();
     }
 
+    if (simParams->haveForceFieldFileName()) {
+        ff->setForceFieldFileName(simParams->getForceFieldFileName());
+    }
+    
     std::string forcefieldFileName;
     forcefieldFileName = ff->getForceFieldFileName();
 
@@ -549,6 +553,9 @@ void SimCreator::setGlobalIndex(SimInfo *info) {
 
 #endif
 
+    //rigidbody's index begins right after atom's
+    beginRigidBodyIndex += info->getNGlobalAtoms();
+
     for(mol = info->beginMolecule(mi); mol != NULL;
         mol = info->nextMolecule(mi)) {