Fixed possible scrolling bug