Amend for #822