Fix sample too