Fixed CPPI detection