FW-228. Another change (forgot to update variable withing for loop).