bug fix
Merge pull request #4517 from ChrisXu1221/master

bug fix