work on #18, elements enumerator bug fix