Fix orig_style undefined values must be kept