2th attempt to fix CS