Fixed issue with index not getting fixed when item is removed.