fix analyze+eval