Fix history pushing