Fixed collision weirdness