Follow-up to 0fadf38