fix #1635