Make history persistent an all situations