Changed logic in Exec->run