Fixed encoding issues