Hi again Christophe,

This patch seems to fix it in the current master.  Please note, I am not
qualified to patch Org directly, so this should be reviewed by those who
know what they're doing.  But it may at least fix it for you or be a
starting point for fixing it.