Fixed main index lookup