Removing this fixes the CDRs.

You got it the wrong way round.
1.7 should not do true. 1.8 should.