Fixed last patch to support Numbers on format()