Fixed Collision bugs