teiiddes-1732: Corrrected CP logic