Attempting forEach fix #2