Fixed overlap logic again