Fix patching