Make unicode address work