actually fixed collisions for reals this time