#105 even better fix for the bad characters, should work a lot better now