Fix execute (again)