diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 8d6a01c6..092266d4 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -25,6 +25,8 @@ import java.nio.ByteOrder;
 
 
 
+import java.util.Map.Entry;
+
 import org.apache.mina.core.buffer.IoBuffer;
 
 import com.sleepycat.persist.model.Persistent;
@@ -160,10 +162,10 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		
 		buffer.putInt(creature.getSkillMods().size());
 		buffer.putInt(creature.getSkillMods().getUpdateCounter());
-		for (SkillMod skillMod : creature.getSkillMods().values()) {
+		for (Entry<String, SkillMod> skillMod : creature.getSkillMods().entrySet()) {
 			buffer.put((byte) 0);
-			buffer.put(getAsciiString(skillMod.getName()));
-			buffer.put(skillMod.getBytes());
+			buffer.put(getAsciiString(skillMod.getKey()));
+			buffer.put(skillMod.getValue().getBytes());
 		}
 		
 		buffer.putFloat(creature.getSpeedMultiplierBase());
diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index 01610e70..36db0db7 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -423,8 +423,7 @@ public class CommandService implements INetworkDispatch  {
 	}
 	
 	public void processCombatCommand(CreatureObject attacker, SWGObject target, CombatCommand command, int actionCounter, String commandArgs) {
-		if(FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py"))
-		{
+		if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py")) {
 			core.scriptService.callScript("scripts/commands/combat/", command.getCommandName(), "setup", core, attacker, target, command);
 		}