We need a patch to patch the patch!