Sampling fix