TableEnumerator fixed