Forgot to move check for is_executed in previous commit