Fixing that index