Self patching