Fix bug with scroll