Fixing non-ascii support