Correct treatment of units containing non-ASCII