fix animate bug
Merge branch 'dev'