ticket:82 preventing getEvent() problems; simplifying logic