fix forEach