Fixing behavior when no animation is desired.