This fixes hardware encoder/decoders for now