Fix sampling...