diff --git a/scripts/commands/setgodmode.py b/scripts/commands/setgodmode.py
index 785de8d0..43449a42 100644
--- a/scripts/commands/setgodmode.py
+++ b/scripts/commands/setgodmode.py
@@ -45,4 +45,8 @@ def run(core, actor, target, commandString):
 		actor.addAbility(str(arg1))
 		actor.sendSystemMessage('You have learned ' + arg1 + '')
 	
+	elif command == 'anim' and arg1:
+		actor.setCurrentAnimation(arg1)
+		actor.sendSystemMessage('Performed ' + arg1 ,0)
+		
 	return
diff --git a/src/protocol/swg/objectControllerObjects/Animation.java b/src/protocol/swg/objectControllerObjects/Animation.java
index c3475969..751b6f1a 100644
--- a/src/protocol/swg/objectControllerObjects/Animation.java
+++ b/src/protocol/swg/objectControllerObjects/Animation.java
@@ -45,7 +45,7 @@ public class Animation extends ObjControllerObject {
 
 	@Override
 	public IoBuffer serialize() {
-		IoBuffer result = IoBuffer.allocate(36).order(ByteOrder.LITTLE_ENDIAN);
+		IoBuffer result = IoBuffer.allocate(16 + animation.length()).order(ByteOrder.LITTLE_ENDIAN);
 		
 		result.putInt(ObjControllerMessage.ANIMATION);