Fix decoding country code