Hotfix switch-tab