Scrollspy fix, again