Fix extended history crash