Re-enabling but encoding handling still not right