fixed hasMore