Fixed animation issues