diff --git a/packages/effect-lens-next/src/Lens.ts b/packages/effect-lens-next/src/Lens.ts
index aa71810..710c496 100644
--- a/packages/effect-lens-next/src/Lens.ts
+++ b/packages/effect-lens-next/src/Lens.ts
@@ -219,11 +219,13 @@ extends LensImpl<A, never, never, never, never> {
  * Note: since `Ref` does not provide any kind of reactivity mechanism, the produced `Lens` will be non-reactive.
  * This means its `changes` stream will only emit the current value once when evaluated and nothing else.
  */
-export const fromRef = Effect.fnUntraced(function* <A>(
+export const fromRef = <A>(
     ref: Ref.Ref<A>
-): Effect.fn.Return<Lens<A, never, never, never, never>, never, never> {
-    return new RefLensImpl(ref, yield* Semaphore.make(1))
-})
+): Effect.Effect<Lens<A, never, never, never, never>, never, never> => Effect.map(
+    Semaphore.make(1),
+    semaphore => new RefLensImpl(ref, semaphore),
+)
+
 
 export class SynchronizedRefLensImpl<in out A>
 extends LensImpl<A, never, never, never, never> {
diff --git a/packages/effect-lens/src/Lens.ts b/packages/effect-lens/src/Lens.ts
index 55515a7..0f76c0b 100644
--- a/packages/effect-lens/src/Lens.ts
+++ b/packages/effect-lens/src/Lens.ts
@@ -182,11 +182,12 @@ extends LensImpl<A, never, never, never, never> {
  * Note: since `Ref` does not provide any kind of reactivity mechanism, the produced `Lens` will be non-reactive.
  * This means its `changes` stream will only emit the current value once when evaluated and nothing else.
  */
-export const fromRef = Effect.fnUntraced(function* <A>(
+export const fromRef = <A>(
     ref: Ref.Ref<A>
-): Effect.fn.Return<Lens<A, never, never, never, never>, never, never> {
-    return new RefLensImpl(ref, yield* Effect.makeSemaphore(1))
-})
+): Effect.Effect<Lens<A, never, never, never, never>, never, never> => Effect.map(
+    Effect.makeSemaphore(1),
+    semaphore => new RefLensImpl(ref, semaphore),
+)
 
 
 export declare namespace SynchronizedRefLensImpl {