Second attempt at fixing data packet decoding.