Staff context-switcher fix