re-apply possible CCM fix. Someone still needs to test this