Patch for #2 - utf8