fix #1647