Final huffman fix