Fixed encoding again