Fix regular sampler