Changes for #854