diff --git a/.classpath b/.classpath
index 6ea45b44..3e0ee877 100644
--- a/.classpath
+++ b/.classpath
@@ -30,6 +30,6 @@
 	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
 	<classpathentry kind="lib" path="ngengine_public.jar"/>
 	<classpathentry kind="lib" path="lib/mbassador-1.1.9.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre8x64"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/services/equipment/EquipmentService.java b/src/services/equipment/EquipmentService.java
index 4f96bd6e..485fb38d 100644
--- a/src/services/equipment/EquipmentService.java
+++ b/src/services/equipment/EquipmentService.java
@@ -109,8 +109,7 @@ public class EquipmentService implements INetworkDispatch {
 				func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item));
 			}
 			
-			processItemAtrributes(actor, item, true);
-			
+				
 			if (replacedEquipment.size() > 0) {
 				actor.getEquipmentList().removeAll(replacedEquipment);
 			}
@@ -120,6 +119,8 @@ public class EquipmentService implements INetworkDispatch {
 			if (item instanceof WeaponObject) {
 				actor.setWeaponId(item.getObjectID());
 			}
+			
+			processItemAtrributes(actor, item, true);//FIXME: If item bonuses stop working this might need to be moved back to the line before "actor.addObjectToEquipList(item);"
 		}
 	}
 	
@@ -143,9 +144,9 @@ public class EquipmentService implements INetworkDispatch {
 				func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item));
 			}
 			
-			processItemAtrributes(actor, item, false);
-			
 			actor.removeObjectFromEquipList(item);
+			
+			processItemAtrributes(actor, item, false);//FIXME: If item bonuses stop working this might need to be moved back to the line before "actor.removeObjectFromEquipList(item);" 
 		}
 	}