Codebook fix