fix #1535