Fixed paginate issue