Fix switching path