Fix CS and exception