Another try at fixing history