diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ad21ac940..380057617 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -2374,7 +2374,7 @@ static void PacketReceived(PacketCommandNG *packet) {
             bool isok = true;
             uint8_t *base = NULL;
 
-            bool raw_address_mode = (flags & READ_MEM_DOWNLOAD_FLAG_RAW) != 0;
+            bool raw_address_mode = (flags & READ_MEM_DOWNLOAD_FLAG_RAW) == READ_MEM_DOWNLOAD_FLAG_RAW;
             if (!raw_address_mode) {
 
                 base = (uint8_t *) _flash_start;
diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 3c9c096ad..b037db677 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -169,7 +169,7 @@ static void UsbPacketReceived(uint8_t *packet) {
             bool isok = true;
             uint8_t *base = NULL;
 
-            bool raw_address_mode = (flags & READ_MEM_DOWNLOAD_FLAG_RAW) != 0;
+            bool raw_address_mode = (flags & READ_MEM_DOWNLOAD_FLAG_RAW) == READ_MEM_DOWNLOAD_FLAG_RAW;
             if (!raw_address_mode) {
 
                 base = (uint8_t *) _flash_start;
diff --git a/client/src/comms.c b/client/src/comms.c
index 9098b7d81..93572ab98 100644
--- a/client/src/comms.c
+++ b/client/src/comms.c
@@ -1136,7 +1136,7 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
         }
         case MCU_FLASH:
         case MCU_MEM: {
-            uint32_t flags = memtype == MCU_MEM ? READ_MEM_DOWNLOAD_FLAG_RAW : 0;
+            uint32_t flags = (memtype == MCU_MEM) ? READ_MEM_DOWNLOAD_FLAG_RAW : 0;
             SendCommandBL(CMD_READ_MEM_DOWNLOAD, start_index, bytes, flags, NULL, 0);
             return dl_it(dest, bytes, response, ms_timeout, show_warning, CMD_READ_MEM_DOWNLOADED);
         }