Fixed a bug where evaluation was broken by resume