fix regression from adding Unicode support