Fix to non-incremental JSON stream