Another go at scrollspy fix