Woops, fixed the collisions... again