Patch to allow for master cli runs