Fixed the formats