Added some more durable disposing logic after stream being used