Fixed collision detection FINALLY