Fix switching samples