Fixing takeUntil full