MTM bug (relied on deprecated vars).