Edited index issue