Issue #21995:fix problem introduced by 21953
Merge pull request #218 from garyhgohoos/21995

Issue #21995:fix problem introduced by 21953