Fixed tab state issue