Fix #1576 - Infinite analysis loop