fix #650