Fixed whitespace error when substituted token contains non alnum.