Fix bug with scrolling