Fix selection of data for each draw