Fix wrong implementation about encoding & decoding bundle raw