Fix hydration with concurrency