Fix unguarded bug.
Merge branch '4.0'