Fix infinite analysis loop issue