Adapt to introduction of MOM.DBW.SAW.QX