Fixed bug mentioned in #891
Fixed bug mentioned in #891
Merge pull request #946 from linzongshu/develop

Fixed bug mentioned in #891