Fixed collision detection. \o/