cpp fix