Fixes #8553: Fix broken table layouts.
Merge pull request #4845 from ehelms/fixes-8553

Fixes #8553: Fix broken table layouts.