Temporary fix of some collision detection issues.