Fix Tab Manager