Not sure what that +1 was for, but it seems to break looping in non-streamed case.