Follow-up fix