Follow-Up to #126
Follow-Up to #126