ENH: Expand the horizon just a tiny bit to make failure even less probable ;)