Improved decoding.