Fixes hclg and decoding