1 files changed, 8 insertions, 7 deletions
diff --git a/src/components/application_manager/src/rpc_passing_handler.cc b/src/components/application_manager/src/rpc_passing_handler.cc
index 8d93659a27..37b01a92f6 100644
--- a/src/components/application_manager/src/rpc_passing_handler.cc
+++ b/src/components/application_manager/src/rpc_passing_handler.cc
@@ -35,12 +35,13 @@
 #include <algorithm>
 #include <iterator>
 
+#include "application_manager/app_service_manager.h"
 #include "application_manager/application.h"
 #include "application_manager/application_manager.h"
-#include "application_manager/rpc_passing_handler.h"
-#include "application_manager/rpc_handler.h"
 #include "application_manager/commands/command_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/rpc_handler.h"
+#include "application_manager/rpc_passing_handler.h"
 #include "application_manager/smart_object_keys.h"
 #include "encryption/hashing.h"
 #include "resumption/last_state.h"
@@ -82,7 +83,7 @@ bool RPCPassingHandler::CanHandleFunctionID(int32_t function_id) {
   auto services = app_service_manager_.GetActiveServices();
   for (auto it = services.begin(); it != services.end(); ++it) {
     auto handled_rpcs =
-        it->second.record[strings::service_manifest][strings::handled_rpcs];
+        it->record[strings::service_manifest][strings::handled_rpcs];
     for (size_t i = 0; i < handled_rpcs.length(); i++) {
       if (handled_rpcs[i].asInt() == function_id) {
         return true;
@@ -186,13 +187,13 @@ void RPCPassingHandler::PopulateRPCRequestQueue(
   for (auto services_it = services.begin(); services_it != services.end();
        ++services_it) {
     auto handled_rpcs =
-        services_it->second
-            .record[strings::service_manifest][strings::handled_rpcs];
+        services_it->record[strings::service_manifest][strings::handled_rpcs];
     for (size_t i = 0; i < handled_rpcs.length(); i++) {
       if (handled_rpcs[i].asInt() == function_id) {
         // Add requests to queue
-        ServiceInfo service_info{services_it->first,
-                                 services_it->second.connection_key};
+        ServiceInfo service_info{
+            services_it->record[strings::service_id].asString(),
+            services_it->connection_key};
         entry.second.push_back(service_info);
         app_manager_.IncreaseForwardedRequestTimeout(origin_connection_key,
                                                      correlation_id);