Fix overlaps; before you'd get a different answer