Decoders - hot fix