Adding fix for no streams consumed