tokenizing fix