Solve format issue