Proper addition of eachIndexPlusOne