diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java
index 0890effe6..f41c8b3c7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java
@@ -26,7 +26,7 @@ public class DisguiseRabbit extends DisguiseAnimal
 		_type = type;
 
 		int id = type.ordinal();
-		DataWatcher.watch(18, id, EntityRabbit.META_TYPE, id);
+		DataWatcher.watch(18, (byte) id, EntityRabbit.META_TYPE, id);
 	}
 
 	public Type getType()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java
index 53703fcfe..7eed06e46 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java
@@ -109,7 +109,13 @@ public class MorphBunny extends MorphAbilityGadget
 
 		if (disguise != null)
 		{
-			Rabbit.Type newType = Rabbit.Type.values()[(disguise.getType().ordinal() + 1) % Rabbit.Type.values().length - 1];
+			Rabbit.Type newType = Rabbit.Type.values()[(disguise.getType().ordinal() + 1) % Rabbit.Type.values().length];
+
+			if (newType == Rabbit.Type.THE_KILLER_BUNNY)
+			{
+				newType = Rabbit.Type.BROWN;
+			}
+
 			disguise.setType(newType);
 			Manager.getDisguiseManager().updateDisguise(disguise);