enhancement to paginator

As pointed out, we need to make sure that we are also on the first page
to make this conditional clause valid