Fixed paging

Fixed to return when no more pages are available