Issue #516 removing Atef's index