1 files changed, 4 insertions, 5 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
index 3bfad3095b..b623350388 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
@@ -88,7 +88,8 @@ void RCAppExtension::UnsubscribeFromInteriorVehicleData(
 void RCAppExtension::UnsubscribeFromInteriorVehicleDataOfType(
     const std::string& module_type) {
   bool unsubscribed = false;
-  for (auto& item : subscribed_interior_vehicle_data_) {
+  auto subscribed_ivi = subscribed_interior_vehicle_data_;
+  for (auto& item : subscribed_ivi) {
     if (module_type == item.first) {
       subscribed_interior_vehicle_data_.erase(item);
       unsubscribed = true;
@@ -198,15 +199,13 @@ void RCAppExtension::RevertResumption(
   const auto module_subscriptions =
       ConvertSmartObjectToModuleCollection(resumption_data);
 
-  for (auto& module : module_subscriptions) {
-    SDL_LOG_TRACE("Requested to unsubscribe module_type  "
-                  << module.first << "module_id: " << module.second);
-  }
   std::set<rc_rpc_plugin::ModuleUid> to_be_unsubscribed;
 
   const auto app_id = application_.app_id();
   auto no_apps_subscribed = [app_id,
                              this](const rc_rpc_plugin::ModuleUid& module) {
+    SDL_LOG_TRACE("Requested to unsubscribe module_type  "
+                  << module.first << "module_id: " << module.second);
     if (plugin_.IsOtherAppsSubscribed(module, app_id)) {
       SDL_LOG_DEBUG("Some other app except " << app_id
                                              << " is already subscribed to "