Bugfix for Tables