History should now behave properly..