Patch CS consistency