Merge "Correct encoding"