Apply #4441 fix to 3.9
Merge pull request #4497 from openscholar/SCHOLAR-3.9-4441

Apply #4441 fix to 3.9