fixed bug in data-table
Merge branch 'hotfix/fix-data-table'