EAP6-18: Patching in place