Fix to Animation crash