[STABLE] Fixed thirst