eval/execute fix