Fix paginator issue