Fixing a str/unicode issue