Follow-up to #53
Follow-up to #53