Testing fix to history states (try #3)