Fix substitutions, should be escaped…