Nicer CCXX handling