Moved completion code outside of animation block

Moved completion code outside of animation block to fix inconsistent
behavior.