fixing token regex