fixed integration with eventemitter objects