fix #1650