Fix possible CCE