Follow-up to #40
Follow-up to #40