More hacking the crappy collision detection