Address issues with sampling.