Fixed: use index