experimental fix when changing streams