Follow-up to 52ba096