Really fix hasMore bug