Static analysis fix