fix #1643