[TASK] Fixed encoding problems