Added UTF-8 support back