Fix for not trying a run through after quick refactor