Fix TableBase