Follow-up to #433
Follow-up to #433