Further fixing of format issue