Finally fix the history settings