fixed #607