fix #618