Fixed bugs formatting zeros