Same fix capturing History data, for context menu