Fix animation issues?