fix major scrolling issue introduce some commits ago