sampler fixes