[WIP] fixing unicode issues