Switch fix