Fixed shouldAnimate