Fixed data encode issue