Fix cpp with piggieback