Fix expand_table_in_table