Fixed Event binding
Merge branch 'hotfix/v1.1.5'