diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
index 8a549637..d3d93319 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
@@ -309,7 +309,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 	glDisable(GL_CULL_FACE);
 
 	Textures *t = Minecraft::GetInstance()->textures;
-	HumanoidModel *model = static_cast<HumanoidModel *>(renderer->getModel(Player::GetModelTypeFromTextureId(t->loadMemTexture(m_customTextureUrl, m_backupTexture))+Player::GetModelTypeFromAnimBitmask(m_uiAnimOverrideBitmask)));
+	HumanoidModel *model = static_cast<HumanoidModel *>(renderer->getModel(Player::GetModelTypeFromTextureId(t->loadMemTexture(m_customTextureUrl, m_backupTexture)-36)+Player::GetModelTypeFromAnimBitmask(m_uiAnimOverrideBitmask)));
 
 	//getAttackAnim(mob, a);
 	//if (armor != nullptr) armor->attackTime = model->attackTime;
diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp
index 5c033874..68801625 100644
--- a/Minecraft.Client/PlayerRenderer.cpp
+++ b/Minecraft.Client/PlayerRenderer.cpp
@@ -76,8 +76,8 @@ PlayerRenderer::PlayerRenderer() : LivingEntityRenderer( new HumanoidModel(0), 0
 
 void PlayerRenderer::setModelType(shared_ptr<Player> player)
 {
-	if (Player::GetModelTypeFromTextureId(player->getCustomSkin()) == 1 || Player::GetModelTypeFromAnimBitmask(player->getAnimOverrideBitmask()) == 1) resModel = humanoidModelWide;
-	else if (Player::GetModelTypeFromTextureId(player->getCustomSkin()) == 2 || Player::GetModelTypeFromAnimBitmask(player->getAnimOverrideBitmask()) == 2) resModel = humanoidModelSlim;
+	if (Player::GetModelTypeFromTextureId(player->getCustomSkin()) == 2 || Player::GetModelTypeFromAnimBitmask(player->getAnimOverrideBitmask()) == 2) resModel = humanoidModelSlim;
+	else if (Player::GetModelTypeFromTextureId(player->getCustomSkin()) == 1 || Player::GetModelTypeFromAnimBitmask(player->getAnimOverrideBitmask()) == 1) resModel = humanoidModelWide;
 	else resModel = humanoidModel;
 }
 
diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp
index 97d6e198..e8756ea7 100644
--- a/Minecraft.World/Player.cpp
+++ b/Minecraft.World/Player.cpp
@@ -727,19 +727,18 @@ void Player::setCustomSkin(DWORD skinId)
 
 }
 
-int Player::GetModelTypeFromAnimBitmask(unsigned int uiAnimOverrideBitmask)
+int Player::GetModelTypeFromAnimBitmask(unsigned int animBitmask)
 {
-	if (uiAnimOverrideBitmask&(1<<HumanoidModel::eAnim_SlimModel)) return 2;
-	else if (uiAnimOverrideBitmask&(1<<HumanoidModel::eAnim_WideModel)) return 1;
-	return 0;
+	if (animBitmask&(1<<HumanoidModel::eAnim_SlimModel)) return 2;
+	else if (animBitmask&(1<<HumanoidModel::eAnim_WideModel)) return 1;
+	else return 0;
 }
 
 int Player::GetModelTypeFromTextureId(int textureId)
 {
 	if (textureId > 8 && textureId < 18) return 2;
 	else if (textureId == 18) return 1;
-	else if (textureId > 44 && textureId < 54) return 2;
-	else if (textureId == 54) return 1;
+	else if (textureId >= 0 && textureId < 9) return 1;
 	else return 0;
 }