fix #1655