CS fix in process with Flitch