fixed subformat bug
fixed subformat bug merge issue