diff --git a/include/etl/cyclic_value.h b/include/etl/cyclic_value.h
index 392c7a14..b0491b23 100644
--- a/include/etl/cyclic_value.h
+++ b/include/etl/cyclic_value.h
@@ -109,16 +109,7 @@ namespace etl
     //*************************************************************************
     void set(T value_)
     {
-      if (value_ > Last)
-      {
-        value_ = Last;
-      }
-      else if (value_ < First)
-      {
-        value_ = First;
-      }
-
-      value = value_;
+      value = clamp(value_, First, Last);
     }
 
     //*************************************************************************
@@ -398,16 +389,7 @@ namespace etl
     //*************************************************************************
     void set(T value_)
     {
-      if (value_ > last_value)
-      {
-        value_ = last_value;
-      }
-      else if (value_ < first_value)
-      {
-        value_ = first_value;
-      }
-
-      value = value_;
+      value = clamp(value_, first_value, last_value);
     }
 
     //*************************************************************************