Fix de-sugaring