Solve newly introduced bug from rebase: multiple tabs were not handled anymore