Fixed analyser issue