OnAnimation fix