fixed null pagination