Same fix than 4.0 except backward

Since 4.1 is still in beta, I suppose backward compatibility is not
mandatory.
However if needed, I will add the protected/public element back as the
missing signature.