Testing fix to history states