Fixes ConcurrentModifiationException when making a final estimate

For each loops cause issues, changes to traditional for loop

Authors: nfbrown, Sam Carlberg