Fixed with Analyzer