Fixed Unicode handling