Fix Collision Detection

done