fix for #602