Fixed problem with scroll position