Overlapping event bug fixed