Fixed that annoying scrolling issue