Fixed Number Format Bug