corrects doubled history states
Merge branch 'patch-3' into patch-4
Merge pull request #656 from stevenvachon/patch-4

no doubled history states