Fix forEach