Another CS fix