More complete for #894