Testing new auto-recovery approach