#1 fix in animation stopping