Fixing indexes