Fixed CS breaks