Fix potential encoding problem