--- branches/development/src/nonbonded/InteractionManager.cpp	2011/04/08 21:25:19	1545
+++ branches/development/src/nonbonded/InteractionManager.cpp	2011/04/30 02:54:02	1554
@@ -40,7 +40,6 @@
  */
  
 #include "nonbonded/InteractionManager.hpp"
-#include "UseTheForce/doForces_interface.h"
 
 namespace OpenMD {
 
@@ -492,8 +491,8 @@ namespace OpenMD {
 	 
     set<NonBondedInteraction*>::iterator it;
 
-    for (it = interactions_[idat.atypes].begin(); 
-         it != interactions_[idat.atypes].end(); ++it){
+    for (it = interactions_[ *(idat.atypes) ].begin(); 
+         it != interactions_[ *(idat.atypes) ].end(); ++it){
       if ((*it)->getFamily() == METALLIC_FAMILY) {
         dynamic_cast<MetallicInteraction*>(*it)->calcDensity(idat);
       }
@@ -524,8 +523,8 @@ namespace OpenMD {
    
     set<NonBondedInteraction*>::iterator it;
 
-    for (it = interactions_[idat.atypes].begin(); 
-         it != interactions_[idat.atypes].end(); ++it)
+    for (it = interactions_[ *(idat.atypes) ].begin(); 
+         it != interactions_[ *(idat.atypes) ].end(); ++it)
       (*it)->calcForce(idat);
     
     return;    
@@ -537,8 +536,8 @@ namespace OpenMD {
     
     set<NonBondedInteraction*>::iterator it;
 
-    for (it = interactions_[idat.atypes].begin(); 
-         it != interactions_[idat.atypes].end(); ++it){
+    for (it = interactions_[ *(idat.atypes) ].begin(); 
+         it != interactions_[ *(idat.atypes) ].end(); ++it){
       if ((*it)->getFamily() == ELECTROSTATIC_FAMILY) {
         dynamic_cast<ElectrostaticInteraction*>(*it)->calcSkipCorrection(idat);
       }