Attempt to fix subtables not being numbered