Fix issue with desugar in make mode