Unicode handling bug fix.