Changing how we enumerate over dictionary values to try and stop it crashing