Fix for cpp