Fix for pageSize=all bug