Animation bug fix