Hopefully made RPM and KPH decoders more resillient