diff --git a/action/ActionHelper.cpp b/action/ActionHelper.cpp
index 42ee4022f..4b64a40ca 100644
--- a/action/ActionHelper.cpp
+++ b/action/ActionHelper.cpp
@@ -46,7 +46,7 @@ void ActionHelper::step(uint8_t step, MessageQueueId_t reportTo,
 void ActionHelper::finish(bool success, MessageQueueId_t reportTo, ActionId_t commandId,
         ReturnValue_t result) {
     CommandMessage reply;
-    ActionMessage::setCompletionReply(success, &reply, commandId, result);
+    ActionMessage::setCompletionReply(&reply, commandId, success, result);
     queueToUse->sendMessage(reportTo, &reply);
 }
 
@@ -69,7 +69,7 @@ void ActionHelper::prepareExecution(MessageQueueId_t commandedBy,
     ipcStore->deleteData(dataAddress);
     if(result == HasActionsIF::EXECUTION_FINISHED) {
         CommandMessage reply;
-        ActionMessage::setCompletionReply(true, &reply, actionId, result);
+        ActionMessage::setCompletionReply(&reply, actionId, true, result);
         queueToUse->sendMessage(commandedBy, &reply);
     }
     if (result != HasReturnvaluesIF::RETURN_OK) {
diff --git a/action/ActionMessage.cpp b/action/ActionMessage.cpp
index 15b59b9dc..66c7f0581 100644
--- a/action/ActionMessage.cpp
+++ b/action/ActionMessage.cpp
@@ -53,8 +53,8 @@ void ActionMessage::setDataReply(CommandMessage* message, ActionId_t actionId,
     message->setParameter2(data.raw);
 }
 
-void ActionMessage::setCompletionReply(bool success, CommandMessage* message,
-        ActionId_t fid, ReturnValue_t result) {
+void ActionMessage::setCompletionReply(CommandMessage* message,
+        ActionId_t fid, bool success, ReturnValue_t result) {
     if (success) {
         message->setCommand(COMPLETION_SUCCESS);
     }
diff --git a/action/ActionMessage.h b/action/ActionMessage.h
index df97485b9..0c64588ca 100644
--- a/action/ActionMessage.h
+++ b/action/ActionMessage.h
@@ -38,8 +38,8 @@ public:
     static ReturnValue_t getReturnCode(const CommandMessage* message );
     static void setDataReply(CommandMessage* message, ActionId_t actionId,
             store_address_t data);
-    static void setCompletionReply(bool success, CommandMessage* message, ActionId_t fid,
-            ReturnValue_t result = HasReturnvaluesIF::RETURN_OK);
+    static void setCompletionReply(CommandMessage* message, ActionId_t fid,
+            bool success, ReturnValue_t result = HasReturnvaluesIF::RETURN_OK);
 
     static void clear(CommandMessage* message);
 };
diff --git a/action/SimpleActionHelper.cpp b/action/SimpleActionHelper.cpp
index 979ee3ad4..8d34f40f2 100644
--- a/action/SimpleActionHelper.cpp
+++ b/action/SimpleActionHelper.cpp
@@ -62,8 +62,8 @@ void SimpleActionHelper::prepareExecution(MessageQueueId_t commandedBy,
         stepCount++;
         break;
     case HasActionsIF::EXECUTION_FINISHED:
-        ActionMessage::setCompletionReply(true, &reply, actionId,
-                HasReturnvaluesIF::RETURN_OK);
+        ActionMessage::setCompletionReply(&reply, actionId,
+                true, HasReturnvaluesIF::RETURN_OK);
         queueToUse->sendMessage(commandedBy, &reply);
         break;
     default: