CLI UTF-8 fix