Attempt fix bad substitution, 2