Fixed MAJOR table-breaking bug