Correctly deal with overlapping events