fix variable subst