resubmitted patch to po4a upstream