Hopefully fix those unicode problems for good...