[BUGFIX beta] #4443 - Replace forEach with a regular for loop