Fixed unicode behaviour