diff --git a/client/src/cmdhftesla.c b/client/src/cmdhftesla.c
index 940687cb4..32b9872e8 100644
--- a/client/src/cmdhftesla.c
+++ b/client/src/cmdhftesla.c
@@ -202,19 +202,21 @@ static int info_hf_tesla(void) {
         PrintAndLogEx(INFO, "%d - %s", i, sprint_hex_inrow(pk[i], 65));
     }
     PrintAndLogEx(INFO, "Form factor... %s " NOLF, sprint_hex_inrow(form_factor, sizeof(form_factor)));
-    uint16_t form_factor_value = form_factor[0] << 8 | form_factor[1];
+
+    uint16_t form_factor_value = MemBeToUint2byte(form_factor);
+
     switch (form_factor_value) {
         case 0x0001:
-            PrintAndLogEx(NORMAL, "(card)");
+            PrintAndLogEx(NORMAL, "( card )");
             break;
         case 0x0022:
-            PrintAndLogEx(NORMAL, "(fob)");
+            PrintAndLogEx(NORMAL, "( fob )");
             break;
         case 0x0031:
-            PrintAndLogEx(NORMAL, "(phone app)");
+            PrintAndLogEx(NORMAL, "( phone app )");
             break;
         default:
-            PrintAndLogEx(NORMAL, "(unknown)");
+            PrintAndLogEx(NORMAL, "( unknown )");
             break;
     }
 
@@ -249,7 +251,6 @@ static int CmdHFTeslaInfo(const char *Cmd) {
     return info_hf_tesla();
 }
 
-
 static int CmdHFTeslaList(const char *Cmd) {
     return CmdTraceListAlias(Cmd, "hf tesla", "7816");
 }
@@ -270,4 +271,4 @@ static int CmdHelp(const char *Cmd) {
 int CmdHFTESLA(const char *Cmd) {
     clearCommandBuffer();
     return CmdsParse(CommandTable, Cmd);
-}
+}
\ No newline at end of file