FIXED(?): CCP locality issues