Bugfix for tablenames with >30 characters