Made compatible with current MTT.