Add paging with little bug