Fix default format issue