diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index c6d657aa7..fab4a21ec 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -320,8 +320,9 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
         {
             break;
         }
+        rig_debug(RIG_DEBUG_WARN, "%s: timeout retry=%d\n", __func__, retry);
 
-        hl_usleep(500 * 1000); // pause a half second
+        //hl_usleep(500 * 1000); // pause a half second -- don't think we need this
     }
     while (retry-- > 0);
 
@@ -330,7 +331,7 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
         rig_debug(RIG_DEBUG_VERBOSE, "%s: failed: %s\n", __func__, rigerror(retval));
     }
 
-    return retval;
+    RETURNFUNC(retval);
 }
 
 /* used in read_icom_frame as end of block */
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 455b7a7a7..307302fe5 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -704,7 +704,7 @@ int icom_get_usb_echo_off(RIG *rig)
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     // reduce the retry here so it's quicker
-    rs->rigport.retry = 1;
+    rs->rigport.retry = 0;
     // Check for echo on first
     priv->serial_USB_echo_off = 0;