Same fix for cpp...