Changed where gpf.defer is used

To respect stream specification