Fix depleted streams situation