diff --git a/src/sfizz/CCMap.h b/src/sfizz/CCMap.h
index a71ba2f4..09e8830c 100644
--- a/src/sfizz/CCMap.h
+++ b/src/sfizz/CCMap.h
@@ -44,7 +44,7 @@ public:
      */
     const ValueType& getWithDefault(int index) const noexcept
     {
-        auto it = absl::c_lower_bound(container, index, CompareCC<ValueType>{});
+        auto it = absl::c_lower_bound(container, index, CCValuePairComparator<ValueType>{});
         if (it == container.end() || it->cc != index) {
             return defaultValue;
         } else {
@@ -60,7 +60,7 @@ public:
      */
     ValueType& operator[](const int& index) noexcept
     {
-        auto it = absl::c_lower_bound(container, index, CompareCC<ValueType>{});
+        auto it = absl::c_lower_bound(container, index, CCValuePairComparator<ValueType>{});
         if (it == container.end() || it->cc != index) {
             auto inserted = container.insert(it, { index, defaultValue });
             return inserted->value;
@@ -85,7 +85,7 @@ public:
      */
     bool contains(int index) const noexcept
     {
-        return absl::c_binary_search(container, index, CompareCC<ValueType>{});
+        return absl::c_binary_search(container, index, CCValuePairComparator<ValueType>{});
     }
     typename std::vector<CCValuePair<ValueType>>::const_iterator begin() const { return container.cbegin(); }
     typename std::vector<CCValuePair<ValueType>>::const_iterator end() const { return container.cend(); }
diff --git a/src/sfizz/SfzHelpers.h b/src/sfizz/SfzHelpers.h
index eb05e6bc..4a69ba95 100644
--- a/src/sfizz/SfzHelpers.h
+++ b/src/sfizz/SfzHelpers.h
@@ -24,8 +24,8 @@ struct CCValuePair {
     ValueType value;
 };
 
-template<class ValueType>
-struct CompareCC {
+template<class ValueType, bool CompareValue = false>
+struct CCValuePairComparator {
     bool operator()(const CCValuePair<ValueType>& valuePair, const int& cc)
     {
         return (valuePair.cc < cc);
@@ -42,6 +42,24 @@ struct CompareCC {
     }
 };
 
+template<class ValueType>
+struct CCValuePairComparator<ValueType, true> {
+    bool operator()(const CCValuePair<ValueType>& valuePair, const ValueType& value)
+    {
+        return (valuePair.value < value);
+    }
+
+    bool operator()(const ValueType& value, const CCValuePair<ValueType>& valuePair)
+    {
+        return (value < valuePair.value);
+    }
+
+    bool operator()(const CCValuePair<ValueType>& lhs, const CCValuePair<ValueType>& rhs)
+    {
+        return (lhs.value < rhs.value);
+    }
+};
+
 /**
  * @brief Converts cents to a pitch ratio
  *