Fixing Collision Detectiong