diff --git a/src/main/java/net/silentclient/client/mixin/mixins/RendererLivingEntityMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/RendererLivingEntityMixin.java
index 60a8230..5593263 100644
--- a/src/main/java/net/silentclient/client/mixin/mixins/RendererLivingEntityMixin.java
+++ b/src/main/java/net/silentclient/client/mixin/mixins/RendererLivingEntityMixin.java
@@ -79,13 +79,16 @@ public class RendererLivingEntityMixin<T extends EntityLivingBase> {
             if (entity instanceof IMob && entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Hostile Entity Render Distance").getValInt()) {
                 ci.cancel();
                 return;
-            } else if ((entity instanceof EntityAnimal || entity instanceof EntityAmbientCreature || entity instanceof EntityWaterMob) && entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Passive Entity Render Distance").getValInt()) {
+            }
+            if ((entity instanceof EntityAnimal || entity instanceof EntityAmbientCreature || entity instanceof EntityWaterMob) && entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Passive Entity Render Distance").getValInt()) {
                 ci.cancel();
                 return;
-            } else if (entity instanceof EntityPlayer && entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Player Render Distance").getValInt()) {
+            }
+            if (entity instanceof EntityPlayer && entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Player Render Distance").getValInt()) {
                 ci.cancel();
                 return;
-            } else if (entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Misc. Entity Render Distance").getValInt()) {
+            }
+            if (entityDistance > Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Misc. Entity Render Distance").getValInt()) {
                 ci.cancel();
                 return;
             }
diff --git a/src/main/java/net/silentclient/client/utils/culling/EntityCulling.java b/src/main/java/net/silentclient/client/utils/culling/EntityCulling.java
index 7086db8..579069d 100644
--- a/src/main/java/net/silentclient/client/utils/culling/EntityCulling.java
+++ b/src/main/java/net/silentclient/client/utils/culling/EntityCulling.java
@@ -162,8 +162,6 @@ public class EntityCulling {
         if (Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Occlusion Culling").getValString().equals("Off") || !shouldPerformCulling) {
             return;
         }
-        
-//        System.out.println("Working!!");
 
         //#if MC==10809
         EntityLivingBase entity = (EntityLivingBase)event.getEntity();
@@ -198,7 +196,9 @@ public class EntityCulling {
             //$$ RenderLivingBase<EntityLivingBase> renderer = event.getRenderer();
             //#endif
 
-            renderer.renderName(entity, x, y, z);
+            if(entity instanceof EntityPlayer) {
+                renderer.renderName(entity, x, y, z);
+            }
         }
 
     }