[BUGFIX] Adapt glitches of context patch