scroll spy fix
Merge branch 'hotfix/scroll-spy-fix'