CS fix #2