Fixed unicode support