fix #1670