fix event triggering
Merge branch 'master' into development