Issue #20926:avoid extraneous call to sFillList
Merge pull request #91 from garyhgohoos/20926

Issue #20926:avoid extraneous call to sFillList