diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 11977e19..6d12b33a 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -367,7 +367,8 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 		}
 		
 		if (getPosture() == resources.datatables.Posture.SkillAnimating) {
-			stopPerformance();//FIXME: Find a way to do this with EntertainmentService
+			//stopPerformance();
+			NGECore.getInstance().entertainmentService.stopPerformance(this);
 		}
 		
 		if (getPosture() == posture) {
diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java
index bec391e5..5a012745 100644
--- a/src/services/EntertainmentService.java
+++ b/src/services/EntertainmentService.java
@@ -733,7 +733,7 @@ public class EntertainmentService implements INetworkDispatch {
 		
 		String performanceType = (performance.getType() == DANCE)? "dance" : "music";
 		
-	   // actor.sendSystemMessage(String.format("@performance:%s_stop_self", performanceType), (byte)0);//FIXME: This hasn't been sending the correct message
+	   actor.sendSystemMessage(String.format("@performance:%s_stop_self", performanceType), (byte)0);//FIXME: This hasn't been sending the correct message
 	    stopAudience(actor);
 
 		if (actor.isPerforming()) {