fixed Subst2