Apply patch from Julien Brisset !