Fix for for loop (due to other changes)