fix the pagiantion issue