Fix string substitution