fix #1823
Merge pull request #1832 from ksss/fix-1823

fix #1823