diff --git a/src/main/java/net/kemitix/conditional/FalseValueClause.java b/src/main/java/net/kemitix/conditional/FalseValueClause.java
index b609428..f4283c3 100644
--- a/src/main/java/net/kemitix/conditional/FalseValueClause.java
+++ b/src/main/java/net/kemitix/conditional/FalseValueClause.java
@@ -33,11 +33,11 @@ import java.util.function.Supplier;
  */
 class FalseValueClause<T> implements Value.ValueClause<T> {
 
-    protected static final Value.ValueClause FALSE = new FalseValueClause();
+    protected static final Value.ValueClause<?> FALSE = new FalseValueClause<>();
 
     @Override
     public ValueSupplier<T> then(final Supplier<T> trueSupplier) {
-        return new FalseValueSupplier();
+        return new FalseValueSupplier<>();
     }
 
     @Override
diff --git a/src/main/java/net/kemitix/conditional/TrueValueClause.java b/src/main/java/net/kemitix/conditional/TrueValueClause.java
index 41707c3..46903c5 100644
--- a/src/main/java/net/kemitix/conditional/TrueValueClause.java
+++ b/src/main/java/net/kemitix/conditional/TrueValueClause.java
@@ -35,7 +35,7 @@ import java.util.function.Supplier;
  */
 class TrueValueClause<T> implements Value.ValueClause<T> {
 
-    protected static final Value.ValueClause TRUE = new TrueValueClause<>();
+    protected static final Value.ValueClause<?> TRUE = new TrueValueClause<>();
 
     @Override
     public ValueSupplier<T> then(final Supplier<T> trueSupplier) {
diff --git a/src/main/java/net/kemitix/conditional/Value.java b/src/main/java/net/kemitix/conditional/Value.java
index d41b481..c07737a 100644
--- a/src/main/java/net/kemitix/conditional/Value.java
+++ b/src/main/java/net/kemitix/conditional/Value.java
@@ -75,11 +75,12 @@ public interface Value {
      *
      * @return a true or false value clause
      */
+    @SuppressWarnings("unchecked")
     static <T> ValueClause<T> where(final boolean clause) {
         if (clause) {
-            return TrueValueClause.TRUE;
+            return (ValueClause<T>) TrueValueClause.TRUE;
         }
-        return FalseValueClause.FALSE;
+        return (ValueClause<T>) FalseValueClause.FALSE;
     }
 
     /**