Tried to fix the unicode bug in the tool as well