Fixed unicode support (again...) :)