Switched from using a window switch in the app to one in stream.