fix B35-2568653
Merge pull request #62 from huangnoah/fix-B35-2568653

fix B35-2568653
Merge pull request #188 from leeyt/master

Fix B35-2568653