diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 388b1dce..2b521459 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -320,7 +320,8 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 			}
 
 		}
-		buffer.putShort((short) 0);
+		//buffer.putShort((short) 0);
+		buffer.put(getAsciiString("appearance/gungan_m.sat"));
 		buffer.put((byte) 1);
 
 		if(creature.getBuffList().isEmpty()) {
diff --git a/src/services/BuffService.java b/src/services/BuffService.java
index a26d3912..28eeefea 100644
--- a/src/services/BuffService.java
+++ b/src/services/BuffService.java
@@ -122,7 +122,7 @@ public class BuffService implements INetworkDispatch {
 					
 		for(final Buff buff : creature.getBuffList().get().toArray(new Buff[] { })) {
 				
-			if(buff.getRemainingDuration() > 0) {
+			if(buff.getRemainingDuration() > 0 && buff.getDuration() > 0) {
 				scheduler.schedule(new Runnable() {
 
 					@Override