Fix HistoryModel