fix #1657