RAZ-3249 : Should now work better with large record set