Fixed bug in RFC string-substitution