Fixing the index