CONTRIB-4251

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
CONTRIB-4251 (fix #2)

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>