CS fix after PR merge