Follow-up to #25
Follow-up to #25