fixed struct subst