Woo! Fixed that nasty collision bug