Wait.. now actually handles non-ascii correct