Follow-up fix for cosmetics changes