Merge pull request #84 from Chunjie/master

[Bug 48056093] fix bug