Static analyser fix