#3797: Fixes for 0, 2, 3, 4.
Merge pull request #3829 from openscholar/3797-0234

#3797: Fixes for 0, 2, 3, 4.