Very nice bugfix - but still does not handle utf8