Bug fixing on paginator