After the scrolling issue fixed