make changes from #4293 against SCHOLAR-3.9 #4194
Merge pull request #4294 from openscholar/4194-hotfix

make changes from #4293 against SCHOLAR-3.9 #4194