More works for #1786