fix #1840

fix #1840