Fixed: CPPI friends bug