EE3 water fix