Adjust paginator issue