Further fixes on sampling distribution