paginator bug fixed-2