WP-4726 Changed to run thru all the elements.