Fixing entities crashing client.