Correct CCM for L != 2. Bugzilla 270