TabController fix