Fixing index conflicts