Fixed issue with scrolling