Follow-up for #828