Fixed PatchAddContext