Patch to allow controller-less execution