fix problem in table
Merge branch 'emergency-branch'