Bug fix for tables without an ID