More proper animation bug fix