Add a check to match start/stop points