fixed #1686
Merge pull request #1690 from ojii/fix-1686

fixed Unihandecode errors