Follow-up for 0ed497b