diff --git a/src/canmap.cpp b/src/canmap.cpp
index 5dd4e42..5b2c37b 100644
--- a/src/canmap.cpp
+++ b/src/canmap.cpp
@@ -703,7 +703,7 @@ CanMap::CANIDMAP* CanMap::FindById(CANIDMAP *canMap, uint32_t canId)
 {
    forEachCanMap(curMap, canMap)
    {
-      if ((curMap->canId & ~SHIFT_FORCE_FLAG(1)) == canId)
+      if ((curMap->canId & ~SHIFT_FORCE_FLAG(1)) == (canId & ~SHIFT_FORCE_FLAG(1)))
          return curMap;
    }
    return 0;