Fix hydration bug