Attempt on fix for Tab manager