Attempt fix bad substitution