Fixed up sampler