Fixed number format issue