[REF] Fix following @yvaucher review