fixing cpp