fix a bug
Merge pull request #2401 from yorkerlin/develop

bug fix