added hack for Huffman