fixing CP issues