Attempting forEach fix