Fix animation. Closes #2603.