Fix for scrolling bug