Issue #33 fix - sometimes events hidden by other events

Fixed issue where sometimes events are hidden behind other events.