With support for unicode add characters back in