fix #1598