Fix bug in CCG assignment (relates to OE-3178)