WIP attempt to patch execute_no_results