Follow-up on c8e72c5