Feature #5893 : fixing some injections with qualifiers