fix missing bundle event
refactoring event dispacher