Issue #21064:improve performance
Merge pull request #34 from garyhgohoos/21064

Issue #21064:improve performance