As it seems 4.1 shall respect the backward compatibility, even if still
in beta, here is the correction to make this PR bacward compatible, as
it was done in 4.0 and 3.9.