Fix code analysis 'forever' regression