Merge pull request #188 from leeyt/master

Fix B35-2568653