fix #1631