diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c
index 4b9e120..c382406 100755
--- a/bin/mbus-serial-scan-secondary.c
+++ b/bin/mbus-serial-scan-secondary.c
@@ -50,8 +50,8 @@ main(int argc, char **argv)
     }
     else if (argc == 4 && strcmp(argv[1], "-d") == 0)
     {
-        device = argv[1];   
-        addr_mask = strdup(argv[2]);
+        device = argv[2];   
+        addr_mask = strdup(argv[3]);
         debug = 1;
     }
     else if (argc == 4 && strcmp(argv[1], "-b") == 0)
diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c
index fc9a147..ef607ae 100755
--- a/mbus/mbus-protocol-aux.c
+++ b/mbus/mbus-protocol-aux.c
@@ -1672,6 +1672,7 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
 
         if (result == MBUS_RECV_RESULT_OK)
         {
+            retry = 0;
             mbus_purge_frames(handle);
         }
         else if (result == MBUS_RECV_RESULT_TIMEOUT)