Fix: match indices