fix for #607