Fix TableList()