Fix hasMore bug