Fix long-standing bug in CPR analysis