Fixed up forEach loop