fix events
Merge branch 'develop'