diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 4dfe1f91..f81f1ff0 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -1000,13 +1000,13 @@ ReturnValue_t CoreController::setBootCopyProtection(Chip targetChip, Copy target
                 performOp = true;
             }
         }
-        else if(selfChip and (CURRENT_CHIP == targetChip)) {
+        else if(selfChip and (currentChip == targetChip)) {
             performOp = true;
         }
-        else if(selfCopy and (CURRENT_COPY == targetCopy)) {
+        else if(selfCopy and (currentCopy == targetCopy)) {
             performOp = true;
         }
-        else if(not selfCopy and (targetChip == currentChip) and (targetCopy == currentCopy)) {
+        else if((targetChip == currentChip) and (targetCopy == currentCopy)) {
             performOp = true;
         }
         if(result != 0) {