Fixed a bug with scrolling behavior