Fix a potentially infinite loop in check_overlap()