forEach bugfix