Fixed paging functionality