Follow-up to #88.
Follow-up to #88.