fix for #612