This corrects and improves my previous version !36 (merged).
Signed-off-by: Loic loic.f@hardenedbsd.org