Fixed Collision Bug Finally