Bugfix: bandaid to prevent Unicode crash