Fixed the issue with reset event
Merge branch 'bugfix-reset-event'