Better recovery

/cc @will2357 @sshillo @flah00