handle old streams differently
1.2.5