Follow up fix