Finally fixed data decoding