add another takeUntil based on a crash report.  not sure which is correct yet