Fixed excessive tab creation