diff --git a/src/main/java/net/tascalate/javaflow/util/SuspendableStream.java b/src/main/java/net/tascalate/javaflow/util/SuspendableStream.java
index 527b807..453599f 100644
--- a/src/main/java/net/tascalate/javaflow/util/SuspendableStream.java
+++ b/src/main/java/net/tascalate/javaflow/util/SuspendableStream.java
@@ -666,5 +666,10 @@ private static interface StreamToOption<T>
         extends SuspendableFunction<SuspendableStream<? extends T>, Option<? extends T>> {}
     
     private static final Supplier<?> NONE_SUPPLIER = () -> Option.none();
-    private static final SuspendableSupplier<?> NONE_SUPPLIER$ = () -> Option.none();
+    private static final SuspendableSupplier<?> NONE_SUPPLIER$ = new SuspendableSupplier<Object>() {
+        @Override
+        public Object get() {
+            return Option.none();
+        }
+    };
 }