Fixed animation issues...