Only escaping the actual token
Double commit but I like this form more