Change to while in main evaluate loop