Fixed potential encoding issue