Fix history problem