First part of Desugar fixing