diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
index 7af974f86..9c8f5c36d 100644
--- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
+++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java
@@ -270,13 +270,13 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol
     	// New Button for Changing Models
 		// URL Swapper
 		if(button.id == 250){
-			npc.display.modelType = button.getValue() * 2;
+			npc.display.modelType = button.displayString.equals("Alex") ? 2 : 1;
 
-			if(npc.display.modelType == 0){
+			if(npc.display.modelType == 1){
 				if (npc.display.skinType == 2){
 					npc.display.skinType = 3;
 				}
-			} else if(npc.display.modelType == 2) {
+			} else {
 				if (npc.display.skinType == 3){
 					npc.display.skinType = 2;
 				}
diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
index 9291bbd37..254c3ef16 100644
--- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
@@ -364,8 +364,10 @@ public class RenderNPCInterface extends RenderLiving{
 			int totalHeight = bufferedimage.getHeight();
 
 			npc.display.x64texture = totalHeight > 32;
-			if (npc.display.x64texture && (npc.display.modelType == 0 || npc.display.modelType == 3)) {
-				bufferedimage = bufferedimage.getSubimage(0, 0, totalWidth, 32);
+			if (npc.display.x64texture) {
+				if (npc.display.modelType == 0 || npc.display.modelType == 3) {
+					bufferedimage = bufferedimage.getSubimage(0, 0, totalWidth, 32);
+				}
 			}
 
 			ImageDownloadAlt object = new ImageDownloadAlt(null, npc.display.texture, SkinManager.field_152793_a, new ImageBufferDownloadAlt(false));
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
index 323a522e3..ef258ed41 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
@@ -80,7 +80,7 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 			modelType = 1;
 		else if(modelType < 0)
 			modelType = 0;
-		npc.display.modelType = modelType * 2;
+		npc.display.modelType = modelType + 1;
 		npc.script.clientNeedsUpdate = true;
 	}