More format correction