Fixed Collisions

Thanks Brett!