Restored recursion to <index>