Feature/unicode fix