fix #1632