Fixed: substitution order