Scroll issue fix