fix issue with patching Context indices