fix #1649