Fix str/bytes issue