Fixed problem with large data sets.