hardening indexing process against our special cases