fixed issue with unicode, may fix timeouts