Analyzer fix