Follow-up to #1658
Follow-up to #1658