[FIX] the regression introduced by the merge of my branch trunk-addons-analytic-on...