BRANCH 4.3: fix for tab_values undefined