bug fixing on scrolling