Fix infinite analysis issue