diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeLastBuffer.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeLastBuffer.cs
index de6c572874..a217ef5fe6 100644
--- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeLastBuffer.cs
+++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/TakeLastBuffer.cs
@@ -70,7 +70,7 @@ public Time(IObservable<TSource> source, TimeSpan duration, IScheduler scheduler
 
             protected override _ CreateSink(IObserver<IList<TSource>> observer) => new _(_duration, observer);
 
-            protected override void Run(_ sink) => sink.Run(this);
+            protected override void Run(_ sink) => sink.Run(_source, _scheduler);
 
             internal sealed class _ : Sink<TSource, IList<TSource>> 
             {
@@ -86,11 +86,11 @@ public _(TimeSpan duration, IObserver<IList<TSource>> observer)
 
                 private IStopwatch _watch;
 
-                public void Run(Time parent)
+                public void Run(IObservable<TSource> source, IScheduler scheduler)
                 {
-                    _watch = parent._scheduler.StartStopwatch();
+                    _watch = scheduler.StartStopwatch();
 
-                    SetUpstream(parent._source.SubscribeSafe(this));
+                    base.Run(source);
                 }
 
                 public override void OnNext(TSource value)