Fix bad merge
Improve auto-scroll on fail