Fixed swapping prevention for Huffman Q2.