No more crash on restart.