Mitigate risk of losing history stacks

this needs more investigation