fix #661