Code-analysis fix