fixed stream not closed issue, PLs now closed