diff --git a/src/protocol/swg/PlayClientEffectObjectMessage.java b/src/protocol/swg/PlayClientEffectObjectMessage.java
index 54a1705e..ad94129f 100644
--- a/src/protocol/swg/PlayClientEffectObjectMessage.java
+++ b/src/protocol/swg/PlayClientEffectObjectMessage.java
@@ -46,10 +46,19 @@ public class PlayClientEffectObjectMessage extends SWGMessage {
 		result.putShort((short) 5);
 		result.putInt(0x8855434A);
 		result.put(getAsciiString(effectFile));
-		if(!effectFile.startsWith("clienteffect/holoemote_")) result.putShort((short) 0); // Because waverunner is a dweeb
-		result.putLong(objectId);
-		result.put(getAsciiString(commandString));
-
+		
+		if(!effectFile.startsWith("clienteffect/holoemote_")) 
+		{
+			result.putShort((short) 0); // Because waverunner is a dweeb
+			result.putLong(objectId);
+			result.put(getAsciiString(commandString));	
+		}
+		else
+		{
+			result.put(getAsciiString(commandString));
+			result.putLong(objectId);
+		}
+		
 		return result.flip();
 
 	}