Fix "bad substitution"