Fixed: Check saturation before removing thirst