Fixed indexing value regression
Fixed indexing value regression
Removed comments