index bugs fix
index conflict fix