fixed animation timing issue
Merge branch 'feature'