Fixing cycling redundancy issues P5b