Fix collision detection!