fix #1617
Merge pull request #1618 from h2so5/fix-1617

fix #1617