Encoding mistakes fixed