issues #19, events are not fired correctly