added Marcus hack to include list elements in the indexing