change variable substitution for future compatible