fix #1669