diff --git a/wxdata/include/scwx/util/map.hpp b/wxdata/include/scwx/util/map.hpp
index e60000ba..9aa2b6f0 100644
--- a/wxdata/include/scwx/util/map.hpp
+++ b/wxdata/include/scwx/util/map.hpp
@@ -26,6 +26,11 @@ ReturnType GetBoundedElement(std::map<Key, T>& map, Key key)
          // looking for
          element = (--it)->second;
       }
+      else
+      {
+         // The current element is a good substitute
+         element = it->second;
+      }
    }
    else if (map.size() > 0)
    {