Fixed history crash