fix #644