diff --git a/daemon/rtsp_server.cpp b/daemon/rtsp_server.cpp
index 5048d2c..72612cc 100644
--- a/daemon/rtsp_server.cpp
+++ b/daemon/rtsp_server.cpp
@@ -178,7 +178,7 @@ void RtspSession::build_response(const std::string& url) {
 void RtspSession::read_request() {
   auto self(shared_from_this());
   if (length_ == max_length) {
-    /* request cannot be consumed and we execeed max length */
+    /* request cannot be consumed and we execeeded max length */
     stop();
   } else {
     socket_.async_read_some(
diff --git a/daemon/session_manager.cpp b/daemon/session_manager.cpp
index 332ca32..20f69f3 100644
--- a/daemon/session_manager.cpp
+++ b/daemon/session_manager.cpp
@@ -415,7 +415,7 @@ static std::array<uint8_t, 6> get_mcast_mac_addr(uint32_t mcast_ip) {
 
 uint8_t SessionManager::get_source_id(const std::string& name) const {
   const auto it = source_names_.find(name);
-  return it != source_names_.end() ? it->second : stream_id_max;
+  return it != source_names_.end() ? it->second : (stream_id_max + 1);
 }
 
 void SessionManager::on_add_source(const StreamSource& source,