Better compatibility with recoveries

Thanks maclaw