Fix of codebook format