Fix some bad substitution