make nav restore more resillient