--- trunk/src/nonbonded/InteractionManager.cpp	2013/09/24 13:52:54	1935
+++ trunk/src/nonbonded/InteractionManager.cpp	2014/10/31 18:40:40	2031
@@ -371,7 +371,7 @@ namespace OpenMD {
       atid1 = atype1->getIdent();
       for (jt = it; jt != simTypes.end(); ++jt) {
         atype2 = (*jt);
-        atid1 = atype1->getIdent();
+        atid2 = atype2->getIdent();
         
         if (interactions_[atid1][atid2].size() == 0) {
           sprintf( painCave.errMsg,
@@ -425,7 +425,7 @@ namespace OpenMD {
     
     int& sHash = sHash_[sdat.atid];
 
-    if ((sHash & EAM_INTERACTION) != 0) eam_->calcFunctional(sdat);
+    if ((sHash & EAM_INTERACTION) != 0)  eam_->calcFunctional(sdat);
     if ((sHash & SC_INTERACTION) != 0)  sc_->calcFunctional(sdat);
 
     // set<NonBondedInteraction*>::iterator it;