Fix for paging and scrolling