Fixing the indexes