Animation crash fix