Fix events with overlapped items