Hopefully made the rest of the implemented decoders more resilient