Bug fix in the table definition
Merge pull request #2016 from atsareg/fix-v6r11

[v6r11] Minor fixes