Changed client so that it still works if target sets numberOfRecords