fix collision detection with hacks...