Added the second fix to solve scrolling issue