History management fix.