Fixed Issue With Tab #2