Fix analyze issue