fix patch new-history after upstream commit