fix for #828