Fix the major collision detection problem
Fix smaller collision detection issue