Fixed encoding errors