Fixed Collision Bugs