fix for #854