Smooth animation, fix potential problem.