Follow-up fix from previous commit