fix issue 1787
Merge pull request #1788 from zionwu/unstable

fix issue 1787