Minor update for #1022