HistoryService bugfix