update for #1869