Replace animation fixed
Revert "Replace animation fixed"

This reverts commit 97cf78cf22c990a4f69408453e865e2d67a2ef03.
Revert "Revert "Replace animation fixed""

This reverts commit 270c5802f1db95302d2566af97046750d5869c13.