Fixed: Bug with encoding strings when they should be encoded