Fix the Format