Fix handling of non-unicode &