Fix for #854