Fix forEach issue