Updated to hopefully fix 'scrolling error'