Yet another fix/tweak on touch/animation.