avoid event listener lost
Merge branch 'develop'