even better solution to event handler reference resolver rebind issue