fix #607