Follow-up to #86
Follow-up to #86