Avoid triggering old stream behavior