Fixed collisions with NPCs!!