Fix the history thing