Animation fix.
Merge conflict.