history tracker bugfix