Follow-up for #564, meta issue #565
Follow-up for #564, meta issue #565