Fixed
Fixed encode bug