Bug fix MOP Vars back compat.