1 files changed, 7 insertions, 8 deletions
diff --git a/src/components/application_manager/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/src/commands/hmi/response_to_hmi.cc
index d18987428e..e6f64047ba 100644
--- a/src/components/application_manager/src/commands/hmi/response_to_hmi.cc
+++ b/src/components/application_manager/src/commands/hmi/response_to_hmi.cc
@@ -31,20 +31,20 @@
  */
 
 #include "application_manager/commands/hmi/response_to_hmi.h"
-#include "application_manager/application_manager_impl.h"
+#include "application_manager/application_manager.h"
 
 namespace application_manager {
 
 namespace commands {
 
-ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message)
-    : CommandImpl(message) {
+ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message,
+                             ApplicationManager& application_manager)
+    : CommandImpl(message, application_manager) {
   // Replace Mobile connection id with HMI app id
-  ApplicationManagerImpl::instance()->ReplaceMobileByHMIAppId(*(message.get()));
+  ReplaceMobileByHMIAppId(*(message.get()));
 }
 
-ResponseToHMI::~ResponseToHMI() {
-}
+ResponseToHMI::~ResponseToHMI() {}
 
 bool ResponseToHMI::Init() {
   return true;
@@ -58,9 +58,8 @@ void ResponseToHMI::Run() {
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
 
-  ApplicationManagerImpl::instance()->SendMessageToHMI(message_);
+  application_manager_.SendMessageToHMI(message_);
 }
 
 }  // namespace commands
 }  // namespace application_manager
-