Fix and enable Format