fixed escapetoken with - and _