Fixed problems with history-updates