This fixes hardware encoders/decoders for now