Index: sources/canbus/messagebuilder.cpp
===================================================================
diff -u -r30f83b2813e68ae3c2806399bf808b642c215b67 -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d
--- sources/canbus/messagebuilder.cpp	(.../messagebuilder.cpp)	(revision 30f83b2813e68ae3c2806399bf808b642c215b67)
+++ sources/canbus/messagebuilder.cpp	(.../messagebuilder.cpp)	(revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d)
@@ -14,6 +14,7 @@
 #include "messagebuilder.h"
 
 // Qt
+#include <QtEndian>
 
 // Project
 #include "logger.h"
@@ -259,7 +260,7 @@
             vMessage.can_id   = vCan_Id;
             vMessage.head     = getHeader   (mPayload); // keep header before taking it out of the payload. doesn't affect payload
             vMessage.sequence = getSequence (mPayload);
-            vMessage.actionId = getActionId (mPayload);
+            vMessage.actionId = static_cast<Gui::GuiActionType>(getActionId(mPayload));
             vMessage.length   = getLength   (mPayload);
             vMessage.data     = getData     (mPayload, vMessage.length);
             vMessage.initialized = true;
@@ -372,12 +373,11 @@
  * \note    Removes the 2 bytes of ActionID from vPayload
  *          It starts from the first byte so those 2 bytes should be the first 2 bytes.
  */
-Gui::GuiActionType MessageBuilder::getActionId(QByteArray &vPayload)
+quint16 MessageBuilder::getActionId(QByteArray &vPayload)
 {
-    quint16 mActionId;
-    mActionId = (vPayload[0] << 8) | vPayload[1];
+    quint16 mActionId = vPayload.mid(0,eLenActionId).toHex().toUInt(0,16);
     vPayload = vPayload.mid(eLenActionId);
-    return static_cast<Gui::GuiActionType>(mActionId);
+    return mActionId;
 }
 
 /*!