Bug fix for scrolling issue