refactor:utils doesn't have reference to that/this
Merge branch 'fix/eventhandler'