fix #1816