Fix animation issue