Make the prevent overlap logic a little smarter.