Reverted scroll issue fix