Fixed collision detection again