format-patch fix, japhb++