1 files changed, 9 insertions, 6 deletions
diff --git a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
index 6c61bfd2a..35c8b96d2 100644
--- a/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
+++ b/src/components/application_manager/src/commands/mobile/delete_interaction_choice_set_request.cc
@@ -100,12 +100,15 @@ bool DeleteInteractionChoiceSetRequest::ChoiceSetInUse(ApplicationConstSharedPtr
 
     PerformChoiceSetMap::const_iterator it = choice_set_map.begin();
     for (; choice_set_map.end() != it; ++it) {
-      if (it->first
-          == (*message_)[strings::msg_params]
-                         [strings::interaction_choice_set_id].asUInt()) {
-        LOG4CXX_ERROR_EXT(logger_,
-                          "DeleteInteractionChoiceSetRequest::ChoiceSetInUse");
-        return true;
+      const PerformChoice& choice =  it->second;
+      PerformChoice::const_iterator choice_it = choice.begin();
+      for (; choice.end() != choice_it; ++choice_it) {
+        if (choice_it->first == (*message_)[strings::msg_params]
+                                [strings::interaction_choice_set_id].asUInt()) {
+          LOG4CXX_ERROR_EXT(logger_,
+                            "DeleteInteractionChoiceSetRequest::ChoiceSetInUse");
+          return true;
+        }
       }
     }
   }