I'm not sure wether this logic is better handled here or in the Analyzer.