patch by original submitter, v1