Repairing SingleCS scenario