Fix sampling