Fixed google encode/decode