[MODIF] Fixed indexer compliance.