WL-2715 change iteration of array
WL-2715 changes re code review