fixed subst
fixed subst