Unicode problems fixed with help of Jacub