Fix issue with format for values