Deal with patching in a different way