Index method fixed